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

Merge pull request #5324 from Squiggles211/apc_load_crash

Browse Source 
Fixes #4790
Fixes #5270
This commit is contained in:
Matthias Mailänder
2014-05-16 09:00:03 +02:00
parent 0f591bb3ba 03e2c77b09
commit bad6a99caf
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Cnc/PoisonedByTiberium.cs
View File

@@ -32,6 +32,9 @@ namespace OpenRA.Mods.Cnc
{ {
if (--poisonTicks > 0) return; if (--poisonTicks > 0) return;
// Prevents harming infantry in cargo.
if (!self.IsInWorld) return;
var rl = self.World.WorldActor.Trait<ResourceLayer>(); var rl = self.World.WorldActor.Trait<ResourceLayer>();
var r = rl.GetResource(self.Location); var r = rl.GetResource(self.Location);
if (r == null) return; if (r == null) return;

10
OpenRA.Mods.RA/Activities/EnterTransport.cs
View File

@@ -41,8 +41,14 @@ namespace OpenRA.Mods.RA.Activities
if (!cells.Contains(self.Location)) if (!cells.Contains(self.Location))
return NextActivity; return NextActivity;
cargo.Load(transport, self); self.World.AddFrameEndTask(w =>
self.World.AddFrameEndTask(w => w.Remove(self)); {
if (self.IsDead() || transport.IsDead() || !cargo.CanLoad(transport, self))
return;
cargo.Load(transport, self);
w.Remove(self);
});
return this; return this;
} }