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

No longer check Carryable IsInWorld when Carryall is killed. Also the Carryable's position is updated to Carryall's position when the Carryall is killed.

Browse Source
This commit is contained in:
JordanBergin
2018-04-08 20:34:50 +01:00
committed by abcdefg30
parent 348932692a
commit 0226c06b93
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.Common/Traits/Carryall.cs
View File

@@ -111,8 +111,13 @@ namespace OpenRA.Mods.Common.Traits
{ {
if (State == CarryallState.Carrying) if (State == CarryallState.Carrying)
{ {
if (Carryable.IsInWorld && !Carryable.IsDead) if (!Carryable.IsDead)
Carryable.Kill(e.Attacker); {
var positionable = Carryable.Trait<IPositionable>();
positionable.SetPosition(Carryable, self.Location);
Carryable.Kill(e.Attacker);
}
Carryable = null; Carryable = null;
} }