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

Fix botmodules querying the Player actor before it is assigned.

Browse Source
This commit is contained in:
matjaeck
2019-11-02 10:39:00 +01:00
committed by reaperrr
parent a74235bdbc
commit 5ac9d2c2f1
6 changed files with 55 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Mods.Common/Traits/BotModules/SquadManagerBotModule.cs
View File

@@ -126,11 +126,18 @@ namespace OpenRA.Mods.Common.Traits
&& !a.GetEnabledTargetTypes().IsEmpty;
}
protected override void Created(Actor self)
{
// Special case handling is required for the Player actor.
// Created is called before Player.PlayerActor is assigned,
// so we must query player traits from self, which refers
// for bot modules always to the Player actor.
notifyPositionsUpdated = self.TraitsImplementing<IBotPositionsUpdated>().ToArray();
notifyIdleBaseUnits = self.TraitsImplementing<IBotNotifyIdleBaseUnits>().ToArray();
}
protected override void TraitEnabled(Actor self)
{
notifyPositionsUpdated = Player.PlayerActor.TraitsImplementing<IBotPositionsUpdated>().ToArray();
notifyIdleBaseUnits = Player.PlayerActor.TraitsImplementing<IBotNotifyIdleBaseUnits>().ToArray();
// Avoid all AIs trying to rush in the same tick, randomize their initial rush a little.
var smallFractionOfRushInterval = Info.RushInterval / 20;
rushTicks = World.LocalRandom.Next(Info.RushInterval - smallFractionOfRushInterval, Info.RushInterval + smallFractionOfRushInterval);