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.

2018-04-08 20:34:50 +01:00
parent 348932692a
commit 0226c06b93
1 changed files with 7 additions and 2 deletions
--- a/OpenRA.Mods.Common/Traits/Carryall.cs
+++ b/OpenRA.Mods.Common/Traits/Carryall.cs
@@ -111,8 +111,13 @@ namespace OpenRA.Mods.Common.Traits
 		{
 			if (State == CarryallState.Carrying)
 			{
-				if (Carryable.IsInWorld && !Carryable.IsDead)
-					Carryable.Kill(e.Attacker);
+				if (!Carryable.IsDead)
+                {
+                    var positionable = Carryable.Trait<IPositionable>();
+                    positionable.SetPosition(Carryable, self.Location);
+                    Carryable.Kill(e.Attacker);
+                }
+
 				Carryable = null;
 			}