Don’t double-remove dead actors from the world.

2014-09-27 08:49:44 +12:00
parent 15e5db855a
commit 56332251f5
1 changed files with 5 additions and 2 deletions
--- a/OpenRA.Game/Actor.cs
+++ b/OpenRA.Game/Actor.cs
@@ -204,9 +204,12 @@ namespace OpenRA
 		{
 			World.AddFrameEndTask(w =>
 			{
-				if (Destroyed) return;
+				if (Destroyed)
+					return;
+
+				if (IsInWorld)
+					World.Remove(this);

-				World.Remove(this);
 				World.traitDict.RemoveActor(this);
 				Destroyed = true;
 			});