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

Prevent crash when unloading Cargo structures

Browse Source
This commit is contained in:
teinarss
2019-08-10 09:02:25 +02:00
committed by abcdefg30
parent 017eca3dc1
commit daa82d113e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Activities/UnloadCargo.cs
View File

@@ -25,6 +25,7 @@ namespace OpenRA.Mods.Common.Activities
readonly INotifyUnload[] notifiers; readonly INotifyUnload[] notifiers;
readonly bool unloadAll; readonly bool unloadAll;
readonly Aircraft aircraft; readonly Aircraft aircraft;
readonly Mobile mobile;
readonly bool assignTargetOnFirstRun; readonly bool assignTargetOnFirstRun;
readonly WDist unloadRange; readonly WDist unloadRange;
@@ -44,6 +45,7 @@ namespace OpenRA.Mods.Common.Activities
notifiers = self.TraitsImplementing<INotifyUnload>().ToArray(); notifiers = self.TraitsImplementing<INotifyUnload>().ToArray();
this.unloadAll = unloadAll; this.unloadAll = unloadAll;
aircraft = self.TraitOrDefault<Aircraft>(); aircraft = self.TraitOrDefault<Aircraft>();
mobile = self.TraitOrDefault<Mobile>();
this.destination = destination; this.destination = destination;
this.unloadRange = unloadRange; this.unloadRange = unloadRange;
} }
@@ -80,7 +82,7 @@ namespace OpenRA.Mods.Common.Activities
QueueChild(new Land(self, destination, unloadRange)); QueueChild(new Land(self, destination, unloadRange));
takeOffAfterUnload = !aircraft.AtLandAltitude; takeOffAfterUnload = !aircraft.AtLandAltitude;
} }
else else if (mobile != null)
{ {
var cell = self.World.Map.Clamp(this.self.World.Map.CellContaining(destination.CenterPosition)); var cell = self.World.Map.Clamp(this.self.World.Map.CellContaining(destination.CenterPosition));
QueueChild(new Move(self, cell, unloadRange)); QueueChild(new Move(self, cell, unloadRange));