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

Add support for carrying effective owners over to husk actors

Browse Source
This commit is contained in:
abcdefg30
2017-08-08 14:47:15 +02:00
committed by reaperrr
parent b9987dcbda
commit b99d21b818
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/SpawnActorOnDeath.cs
View File

@@ -106,6 +106,9 @@ namespace OpenRA.Mods.Common.Traits
new FactionInit(faction) new FactionInit(faction)
}; };
if (self.EffectiveOwner != null && self.EffectiveOwner.Disguised)
td.Add(new EffectiveOwnerInit(self.EffectiveOwner.Owner));
if (Info.OwnerType == OwnerType.Victim) if (Info.OwnerType == OwnerType.Victim)
{ {
// Fall back to InternalOwner if the Victim was defeated, // Fall back to InternalOwner if the Victim was defeated,
@@ -115,7 +118,8 @@ namespace OpenRA.Mods.Common.Traits
else else
{ {
td.Add(new OwnerInit(self.World.Players.First(p => p.InternalName == Info.InternalOwner))); td.Add(new OwnerInit(self.World.Players.First(p => p.InternalName == Info.InternalOwner)));
td.Add(new EffectiveOwnerInit(self.Owner)); if (!td.Contains<EffectiveOwnerInit>())
td.Add(new EffectiveOwnerInit(self.Owner));
} }
} }
else if (Info.OwnerType == OwnerType.Killer) else if (Info.OwnerType == OwnerType.Killer)