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

Fix DeliverUnit-related crash

Browse Source
This commit is contained in:
reaperrr
2019-11-21 00:00:04 +01:00
committed by abcdefg30
parent baa5b3d25e
commit 804d61a6a1
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Activities/DeliverUnit.cs
View File

@@ -97,8 +97,14 @@ namespace OpenRA.Mods.Common.Activities
// Put back into world // Put back into world
self.World.AddFrameEndTask(w => self.World.AddFrameEndTask(w =>
{ {
if (self.IsDead)
return;
var cargo = carryall.Carryable; var cargo = carryall.Carryable;
var carryable = carryall.Carryable.Trait<Carryable>(); if (cargo == null)
return;
var carryable = cargo.Trait<Carryable>();
w.Add(cargo); w.Add(cargo);
carryall.DetachCarryable(self); carryall.DetachCarryable(self);
carryable.UnReserve(cargo); carryable.UnReserve(cargo);