Merge pull request #6575 from pchote/selfhealing

Add elite self-healing bonus
2014-09-27 13:19:24 +02:00
parent 3a64fd717f 2bbdd0ae06
commit ffeff5c7b6
12 changed files with 185 additions and 53 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;
 			});