Merge pull request #8226 from pchote/actor-disposal

Dispose traits when destroying an actor.

OpenRA.Mods.Common/Activities/Air/FallToEarth.cs

@@ -43,7 +43,7 @@ namespace OpenRA.Mods.Common.Activities
 					weapon.Impact(Target.FromPos(self.CenterPosition), self, Enumerable.Empty<int>());
 				}
 
-				self.Destroy();
+				self.Dispose();
 				return null;
 			}
 

OpenRA.Mods.Common/Activities/CaptureActor.cs

@@ -71,7 +71,7 @@ namespace OpenRA.Mods.Common.Activities
 					actor.InflictDamage(self, damage, null);
 				}
 
-				self.Destroy();
+				self.Dispose();
 			});
 		}
 	}

OpenRA.Mods.Common/Activities/DonateSupplies.cs

@@ -31,7 +31,7 @@ namespace OpenRA.Mods.Common.Activities
 				return;
 
 			target.Owner.PlayerActor.Trait<PlayerResources>().GiveCash(payload);
-			self.Destroy();
+			self.Dispose();
 
 			if (self.Owner.IsAlliedWith(self.World.RenderPlayer))
 				self.World.AddFrameEndTask(w => w.Add(new FloatingText(target.CenterPosition, target.Owner.Color.RGB, FloatingText.FormatCashTick(payload), 30)));

OpenRA.Mods.Common/Activities/ExternalCaptureActor.cs

@@ -77,7 +77,7 @@ namespace OpenRA.Mods.Common.Activities
 						capturable.EndCapture();
 
 						if (capturesInfo != null && capturesInfo.ConsumeActor)
-							self.Destroy();
+							self.Dispose();
 					});
 				}
 			}

OpenRA.Mods.Common/Activities/RemoveSelf.cs

@@ -17,7 +17,7 @@ namespace OpenRA.Mods.Common.Activities
 		public override Activity Tick(Actor self)
 		{
 			if (IsCanceled) return NextActivity;
-			self.Destroy();
+			self.Dispose();
 			return null;
 		}
 	}

OpenRA.Mods.Common/Activities/RepairBridge.cs

@@ -33,7 +33,7 @@ namespace OpenRA.Mods.Common.Activities
 			if (hut.BridgeDamageState == DamageState.Undamaged || hut.Repairing || hut.Bridge.GetHut(0) == null || hut.Bridge.GetHut(1) == null)
 				return;
 			hut.Repair(self);
-			self.Destroy();
+			self.Dispose();
 		}
 	}
 }

OpenRA.Mods.Common/Activities/RepairBuilding.cs

@@ -34,7 +34,7 @@ namespace OpenRA.Mods.Common.Activities
 			if (health.DamageState == DamageState.Undamaged)
 				return;
 			target.InflictDamage(self, -health.MaxHP, null);
-			self.Destroy();
+			self.Dispose();
 		}
 	}
 }

OpenRA.Mods.Common/Activities/Sell.cs

@@ -41,7 +41,7 @@ namespace OpenRA.Mods.Common.Activities
 			if (refund > 0 && self.Owner.IsAlliedWith(self.World.RenderPlayer))
 				self.World.AddFrameEndTask(w => w.Add(new FloatingText(self.CenterPosition, self.Owner.Color.RGB, FloatingText.FormatCashTick(refund), 30)));
 
-			self.Destroy();
+			self.Dispose();
 			return this;
 		}
 

OpenRA.Mods.Common/Activities/Transform.cs

@@ -48,7 +48,7 @@ namespace OpenRA.Mods.Common.Activities
 				var selected = w.Selection.Contains(self);
 				var controlgroup = w.Selection.GetControlGroupForActor(self);
 
-				self.Destroy();
+				self.Dispose();
 				foreach (var s in Sounds)
 					Sound.PlayToPlayer(self.Owner, s, self.CenterPosition);
 

OpenRA.Mods.Common/Activities/UnloadCargo.cs

@@ -76,7 +76,7 @@ namespace OpenRA.Mods.Common.Activities
 			cargo.Unload(self);
 			self.World.AddFrameEndTask(w =>
 			{
-				if (actor.Destroyed)
+				if (actor.Disposed)
 					return;
 
 				var move = actor.Trait<IMove>();