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

Remove workarounds for querying the PlayerActor in Created

Browse Source
This commit is contained in:
abcdefg30
2020-05-24 19:51:58 +02:00
committed by reaperrr
parent 52a9fcef3c
commit 27d0465891
12 changed files with 20 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnPrerequisite.cs
View File

@@ -44,13 +44,7 @@ namespace OpenRA.Mods.Common.Traits
void INotifyCreated.Created(Actor self)
{
// Special case handling is required for the Player actor.
// Created is called before Player.PlayerActor is assigned,
// so we must query other player traits from self, knowing that
// it refers to the same actor as self.Owner.PlayerActor
var playerActor = self.Info.Name == "player" ? self : self.Owner.PlayerActor;
globalManager = playerActor.Trait<GrantConditionOnPrerequisiteManager>();
globalManager = self.Owner.PlayerActor.Trait<GrantConditionOnPrerequisiteManager>();
}
void INotifyAddedToWorld.AddedToWorld(Actor self)