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

Special-case the player actor on GCOnBotOwner.

Browse Source
This commit is contained in:
Zimmermann Gyula
2018-07-26 20:22:22 +02:00
committed by abcdefg30
parent 1513068114
commit 51a99cb43c
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnBotOwner.cs
View File

@@ -44,9 +44,16 @@ namespace OpenRA.Mods.Common.Traits
void INotifyCreated.Created(Actor self) void INotifyCreated.Created(Actor self)
{ {
conditionManager = self.TraitOrDefault<ConditionManager>(); // Special case handling is required for the Player actor.
if (conditionManager != null && self.Owner.IsBot && info.Bots.Contains(self.Owner.BotType)) // Created is called before Player.IsBot is set, so we
conditionToken = conditionManager.GrantCondition(self, info.Condition); // must use a different method to enable this trait if
// it's defined on the PlayerActor.
self.World.AddFrameEndTask(w =>
{
conditionManager = self.TraitOrDefault<ConditionManager>();
if (conditionManager != null && self.Owner.IsBot && info.Bots.Contains(self.Owner.BotType))
conditionToken = conditionManager.GrantCondition(self, info.Condition);
});
} }
void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner) void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)