From 4a7bb39fbe62837868100ce0273fd1a02f85fb70 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Wed, 23 May 2018 19:41:03 +0000 Subject: [PATCH] Remove order.TargetActor from Infiltrates, EngineerRepair, ExternalCaptures. These cases already checked order.Target.Type so these are simple swaps. --- OpenRA.Mods.Cnc/Traits/Infiltration/Infiltrates.cs | 2 +- OpenRA.Mods.Common/Traits/EngineerRepair.cs | 2 +- OpenRA.Mods.Common/Traits/ExternalCaptures.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenRA.Mods.Cnc/Traits/Infiltration/Infiltrates.cs b/OpenRA.Mods.Cnc/Traits/Infiltration/Infiltrates.cs index 9ad770adf2..aa9d4121bb 100644 --- a/OpenRA.Mods.Cnc/Traits/Infiltration/Infiltrates.cs +++ b/OpenRA.Mods.Cnc/Traits/Infiltration/Infiltrates.cs @@ -78,7 +78,7 @@ namespace OpenRA.Mods.Cnc.Traits targetTypes = order.Target.FrozenActor.TargetTypes; if (order.Target.Type == TargetType.Actor) - targetTypes = order.TargetActor.GetEnabledTargetTypes(); + targetTypes = order.Target.Actor.GetEnabledTargetTypes(); return Info.Types.Overlaps(targetTypes); } diff --git a/OpenRA.Mods.Common/Traits/EngineerRepair.cs b/OpenRA.Mods.Common/Traits/EngineerRepair.cs index 2c6a0c2da1..73a986eb36 100644 --- a/OpenRA.Mods.Common/Traits/EngineerRepair.cs +++ b/OpenRA.Mods.Common/Traits/EngineerRepair.cs @@ -60,7 +60,7 @@ namespace OpenRA.Mods.Common.Traits return order.Target.FrozenActor.DamageState > DamageState.Undamaged; if (order.Target.Type == TargetType.Actor) - return order.TargetActor.GetDamageState() > DamageState.Undamaged; + return order.Target.Actor.GetDamageState() > DamageState.Undamaged; return false; } diff --git a/OpenRA.Mods.Common/Traits/ExternalCaptures.cs b/OpenRA.Mods.Common/Traits/ExternalCaptures.cs index b86aa998b8..2b42b08048 100644 --- a/OpenRA.Mods.Common/Traits/ExternalCaptures.cs +++ b/OpenRA.Mods.Common/Traits/ExternalCaptures.cs @@ -80,8 +80,8 @@ namespace OpenRA.Mods.Common.Traits if (order.Target.Type == TargetType.Actor) { - var c = order.TargetActor.TraitOrDefault(); - return c != null && !c.CaptureInProgress && c.CanBeTargetedBy(self, order.TargetActor.Owner); + var c = order.Target.Actor.TraitOrDefault(); + return c != null && !c.CaptureInProgress && c.CanBeTargetedBy(self, order.Target.Actor.Owner); } return false;