Merge pull request #13195 from atlimit8/ActorExts-AppearsFriendlyTo-simplification

ActorExts.AppearsFriendlyTo Simplification
This commit is contained in:
reaperrr
2017-04-25 23:29:37 +02:00
committed by GitHub

View File

@@ -47,7 +47,7 @@ namespace OpenRA.Mods.Common
if (self.EffectiveOwner != null && self.EffectiveOwner.Disguised && !toActor.Info.HasTraitInfo<IgnoresDisguiseInfo>()) if (self.EffectiveOwner != null && self.EffectiveOwner.Disguised && !toActor.Info.HasTraitInfo<IgnoresDisguiseInfo>())
return toActor.Owner.Stances[self.EffectiveOwner.Owner] == Stance.Ally; return toActor.Owner.Stances[self.EffectiveOwner.Owner] == Stance.Ally;
return stance == Stance.Ally; return false;
} }
public static bool AppearsHostileTo(this Actor self, Actor toActor) public static bool AppearsHostileTo(this Actor self, Actor toActor)