From d97a2a5fa02c0c7873f8aa008fdcbff9a451ab33 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 29 Sep 2018 22:28:38 +0100 Subject: [PATCH] Remove legacy building lock calls. This has been superseded by conditions. --- OpenRA.Mods.Common/Activities/CaptureActor.cs | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/OpenRA.Mods.Common/Activities/CaptureActor.cs b/OpenRA.Mods.Common/Activities/CaptureActor.cs index 6d3adaaa5e..b60146b88a 100644 --- a/OpenRA.Mods.Common/Activities/CaptureActor.cs +++ b/OpenRA.Mods.Common/Activities/CaptureActor.cs @@ -20,7 +20,6 @@ namespace OpenRA.Mods.Common.Activities public class CaptureActor : Enter { readonly Actor actor; - readonly Building building; readonly CaptureManager targetManager; readonly CaptureManager manager; @@ -28,7 +27,6 @@ namespace OpenRA.Mods.Common.Activities : base(self, target, EnterBehaviour.Dispose) { actor = target; - building = actor.TraitOrDefault(); manager = self.Trait(); targetManager = target.Trait(); } @@ -72,14 +70,8 @@ namespace OpenRA.Mods.Common.Activities void DoCapture(Actor self, Captures captures) { - if (building != null && !building.Lock()) - return; - self.World.AddFrameEndTask(w => { - if (building != null && building.Locked) - building.Unlock(); - // Sabotage instead of capture if (captures.Info.SabotageThreshold > 0 && !actor.Owner.NonCombatant) { @@ -106,9 +98,6 @@ namespace OpenRA.Mods.Common.Activities foreach (var t in actor.TraitsImplementing()) t.OnCapture(actor, self, oldOwner, self.Owner); - if (building != null && building.Locked) - building.Unlock(); - if (self.Owner.Stances[oldOwner].HasStance(captures.Info.PlayerExperienceStances)) { var exp = self.Owner.PlayerActor.TraitOrDefault();