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(); - 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().anim.CurrentSequence.Name) self.Trait().anim.PlayRepeating(seq); - uim.Add(self, this); + if( self.IsInWorld ) + uim.Add(self, this); } public IEnumerable CrushClasses { get { yield return "crate"; } }