finished TraitDictionary. Refactored permanent actor-removal.

OpenRA.Mods.RA/Activities/CaptureBuilding.cs

@@ -34,8 +34,8 @@ namespace OpenRA.Mods.RA.Activities
 				
 				foreach (var t in target.TraitsImplementing<INotifyCapture>())
 					t.OnCapture(target, self, oldOwner, self.Owner);
-				
-				w.Remove(self);
+
+				self.Destroy();
 			});
 			return NextActivity;
 		}

OpenRA.Mods.RA/Activities/Infiltrate.cs

@@ -26,7 +26,7 @@ namespace OpenRA.Mods.RA.Activities
 			foreach (var t in target.TraitsImplementing<IAcceptSpy>())
 				t.OnInfiltrate(target, self);
 
-			self.World.AddFrameEndTask(w => w.Remove(self));
+			self.Destroy();
 
 			return NextActivity;
 		}

OpenRA.Mods.RA/Activities/RepairBuilding.cs

@@ -27,8 +27,8 @@ namespace OpenRA.Mods.RA.Activities
 			if (health.DamageState == DamageState.Undamaged)
 				return NextActivity;
 			
-			target.InflictDamage(self, -health.MaxHP, null);			
-			self.World.AddFrameEndTask(w => w.Remove(self));
+			target.InflictDamage(self, -health.MaxHP, null);
+			self.Destroy();
 
 			return NextActivity;
 		}

OpenRA.Mods.RA/Activities/Transform.cs

@@ -48,11 +48,11 @@ namespace OpenRA.Mods.RA.Activities
 			self.World.AddFrameEndTask(w =>
 			{
 				var selected = w.Selection.Contains(self);
-				
-				self.World.Remove(self);
+
+				self.Destroy();
 				foreach (var s in sounds)
 					Sound.PlayToPlayer(self.Owner, s, self.CenterLocation);
-								
+
 				var init = new TypeDictionary
 				{
 					new LocationInit( self.Location + offset ),