From 12f9c0bce982e1146ee2963b84621d6e09fe0635 Mon Sep 17 00:00:00 2001
From: Bob <ytinasni@gmail.com>
Date: Sun, 7 Nov 2010 13:05:18 +1300
Subject: [PATCH] fix uim-crate crash

---
 OpenRA.Mods.RA/Crate.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/OpenRA.Mods.RA/Crate.cs b/OpenRA.Mods.RA/Crate.cs
index 1dd3f31e51..71ba0f5187 100644
--- a/OpenRA.Mods.RA/Crate.cs
+++ b/OpenRA.Mods.RA/Crate.cs
@@ -100,7 +100,8 @@ namespace OpenRA.Mods.RA
 		{
 			var uim = self.World.WorldActor.Trait<UnitInfluence>();
 
-			uim.Remove(self, this);
+			if( self.IsInWorld )
+				uim.Remove(self, this);
 
 			Location = cell;
 			PxPosition = Util.CenterOfCell(cell);
@@ -109,7 +110,8 @@ namespace OpenRA.Mods.RA
 			if (seq != self.Trait<RenderSimple>().anim.CurrentSequence.Name)
 				self.Trait<RenderSimple>().anim.PlayRepeating(seq);
 
-			uim.Add(self, this);
+			if( self.IsInWorld )
+				uim.Add(self, this);
 		}
 
 		public IEnumerable<string> CrushClasses { get { yield return "crate"; } }