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

Fix AI crashing when trying to make parachuted harvester search map for resources while mid-air

Browse Source
This commit is contained in:
reaperrr
2017-12-08 02:12:51 +01:00
committed by abcdefg30
parent b5ffe17d60
commit 85c5259361
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/AI/HackyAI.cs
View File

@@ -833,6 +833,10 @@ namespace OpenRA.Mods.Common.AI
continue; continue;
} }
var para = harvester.TraitOrDefault<Parachutable>();
if (para != null && para.IsInAir)
continue;
// Tell the idle harvester to quit slacking: // Tell the idle harvester to quit slacking:
var newSafeResourcePatch = FindNextResource(harvester, harv); var newSafeResourcePatch = FindNextResource(harvester, harv);
BotDebug("AI: Harvester {0} is idle. Ordering to {1} in search for new resources.".F(harvester, newSafeResourcePatch)); BotDebug("AI: Harvester {0} is idle. Ordering to {1} in search for new resources.".F(harvester, newSafeResourcePatch));

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

@@ -59,6 +59,8 @@ namespace OpenRA.Mods.Common.Traits
positionable = self.Trait<IPositionable>(); positionable = self.Trait<IPositionable>();
} }
public bool IsInAir { get; private set; }
void INotifyCreated.Created(Actor self) void INotifyCreated.Created(Actor self)
{ {
conditionManager = self.TraitOrDefault<ConditionManager>(); conditionManager = self.TraitOrDefault<ConditionManager>();
@@ -66,12 +68,16 @@ namespace OpenRA.Mods.Common.Traits
void INotifyParachute.OnParachute(Actor self) void INotifyParachute.OnParachute(Actor self)
{ {
IsInAir = true;
if (conditionManager != null && parachutingToken == ConditionManager.InvalidConditionToken && !string.IsNullOrEmpty(info.ParachutingCondition)) if (conditionManager != null && parachutingToken == ConditionManager.InvalidConditionToken && !string.IsNullOrEmpty(info.ParachutingCondition))
parachutingToken = conditionManager.GrantCondition(self, info.ParachutingCondition); parachutingToken = conditionManager.GrantCondition(self, info.ParachutingCondition);
} }
void INotifyParachute.OnLanded(Actor self, Actor ignore) void INotifyParachute.OnLanded(Actor self, Actor ignore)
{ {
IsInAir = false;
if (parachutingToken != ConditionManager.InvalidConditionToken) if (parachutingToken != ConditionManager.InvalidConditionToken)
parachutingToken = conditionManager.RevokeCondition(self, parachutingToken); parachutingToken = conditionManager.RevokeCondition(self, parachutingToken);