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

Fix crash with dead cargo.

Browse Source
This commit is contained in:
tovl
2019-08-30 19:28:47 +02:00
committed by abcdefg30
parent 4f99982ef1
commit 46c0b4cf31
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Common/Activities/RideTransport.cs
View File

@@ -53,6 +53,9 @@ namespace OpenRA.Mods.Common.Activities
{ {
self.World.AddFrameEndTask(w => self.World.AddFrameEndTask(w =>
{ {
if (self.IsDead)
return;
// Make sure the target hasn't changed while entering // Make sure the target hasn't changed while entering
// OnEnterComplete is only called if targetActor is alive // OnEnterComplete is only called if targetActor is alive
if (targetActor != enterActor) if (targetActor != enterActor)

2
OpenRA.Mods.Common/Traits/Cargo.cs
View File

@@ -229,7 +229,7 @@ namespace OpenRA.Mods.Common.Traits
} }
return !IsEmpty(self) && (aircraft == null || aircraft.CanLand(self.Location, blockedByMobile: false)) return !IsEmpty(self) && (aircraft == null || aircraft.CanLand(self.Location, blockedByMobile: false))
&& CurrentAdjacentCells != null && CurrentAdjacentCells.Any(c => Passengers.Any(p => p.Trait<IPositionable>().CanEnterCell(c, null, immediate))); && CurrentAdjacentCells != null && CurrentAdjacentCells.Any(c => Passengers.Any(p => !p.IsDead && p.Trait<IPositionable>().CanEnterCell(c, null, immediate)));
} }
public bool CanLoad(Actor self, Actor a) public bool CanLoad(Actor self, Actor a)