From de8fa56461282689d97f8633bc0950fdfe7826d1 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 6 Oct 2018 15:06:29 +0100 Subject: [PATCH] Remove obsolete building lock check from BaseProvider. --- OpenRA.Mods.Common/Traits/Buildings/BaseProvider.cs | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Buildings/BaseProvider.cs b/OpenRA.Mods.Common/Traits/Buildings/BaseProvider.cs index 1bf56f6edb..07bf2a47a9 100644 --- a/OpenRA.Mods.Common/Traits/Buildings/BaseProvider.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/BaseProvider.cs @@ -27,15 +27,13 @@ namespace OpenRA.Mods.Common.Traits public override object Create(ActorInitializer init) { return new BaseProvider(init.Self, this); } } - public class BaseProvider : PausableConditionalTrait, ITick, INotifyCreated, IRenderAboveShroudWhenSelected, ISelectionBar + public class BaseProvider : PausableConditionalTrait, ITick, IRenderAboveShroudWhenSelected, ISelectionBar { readonly DeveloperMode devMode; readonly Actor self; readonly bool allyBuildEnabled; readonly bool buildRadiusEnabled; - Building building; - int total; int progress; @@ -50,11 +48,6 @@ namespace OpenRA.Mods.Common.Traits buildRadiusEnabled = mapBuildRadius != null && mapBuildRadius.BuildRadiusEnabled; } - void INotifyCreated.Created(Actor self) - { - building = self.TraitOrDefault(); - } - void ITick.Tick(Actor self) { if (progress > 0) @@ -68,7 +61,7 @@ namespace OpenRA.Mods.Common.Traits public bool Ready() { - if (IsTraitDisabled || IsTraitPaused || (building != null && building.Locked)) + if (IsTraitDisabled || IsTraitPaused) return false; return devMode.FastBuild || progress == 0;