epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove effective owner check when choosing armament

Browse Source
This commit is contained in:
Curtis Shmyr
2020-10-09 18:13:00 -06:00
committed by abcdefg30
parent a375f0e58a
commit 8d5ed65feb
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
View File

@@ -371,20 +371,9 @@ namespace OpenRA.Mods.Common.Traits
// (short-circuiting in the logical expression below) // (short-circuiting in the logical expression below)
Player owner = null; Player owner = null;
if (t.Type == TargetType.FrozenActor) if (t.Type == TargetType.FrozenActor)
{
owner = t.FrozenActor.Owner; owner = t.FrozenActor.Owner;
}
else if (t.Type == TargetType.Actor) else if (t.Type == TargetType.Actor)
{ owner = t.Actor.Owner;
owner = t.Actor.EffectiveOwner != null && t.Actor.EffectiveOwner.Owner != null
? t.Actor.EffectiveOwner.Owner
: t.Actor.Owner;
// Special cases for spies so we don't kill friendly disguised spies
// and enable dogs to kill enemy disguised spies.
if (self.Owner.Stances[t.Actor.Owner] == Stance.Ally || self.Info.HasTraitInfo<IgnoresDisguiseInfo>())
owner = t.Actor.Owner;
}
return Armaments.Where(a => return Armaments.Where(a =>
!a.IsTraitDisabled !a.IsTraitDisabled