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

Fix FallsToEarth queueing an activity in its ctor

Browse Source
This commit is contained in:
abcdefg30
2019-10-05 16:56:35 +02:00
committed by Paul Chote
parent 56726a0533
commit acea19312d
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Traits/Air/FallsToEarth.cs
View File

@@ -42,18 +42,24 @@ namespace OpenRA.Mods.Common.Traits
} }
} }
public class FallsToEarth : IEffectiveOwner public class FallsToEarth : IEffectiveOwner, INotifyCreated
{ {
readonly FallsToEarthInfo info;
readonly Player effectiveOwner; readonly Player effectiveOwner;
public FallsToEarth(ActorInitializer init, FallsToEarthInfo info) public FallsToEarth(ActorInitializer init, FallsToEarthInfo info)
{ {
init.Self.QueueActivity(false, new FallToEarth(init.Self, info)); this.info = info;
effectiveOwner = init.Contains<EffectiveOwnerInit>() ? init.Get<EffectiveOwnerInit, Player>() : init.Self.Owner; effectiveOwner = init.Contains<EffectiveOwnerInit>() ? init.Get<EffectiveOwnerInit, Player>() : init.Self.Owner;
} }
// We return init.Self.Owner if there's no effective owner // We return init.Self.Owner if there's no effective owner
bool IEffectiveOwner.Disguised { get { return true; } } bool IEffectiveOwner.Disguised { get { return true; } }
Player IEffectiveOwner.Owner { get { return effectiveOwner; } } Player IEffectiveOwner.Owner { get { return effectiveOwner; } }
void INotifyCreated.Created(Actor self)
{
self.QueueActivity(false, new FallToEarth(self, info));
}
} }
} }