Revert "Merge remote-tracking branch 'darkademic/dev'"

This reverts commit 2b383ba, reversing
changes made to 5387576.

Author: Inq8

OpenRA.Mods.CA/Traits/AdvancesTimeline.cs

@@ -8,7 +8,6 @@
  */
 #endregion
 
-using System.Collections.Generic;
 using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Primitives;
@@ -47,21 +46,16 @@ class InfiltrateToCreateProxyActorInfo : TraitInfo
 		[Desc("If true, spawn at the location of the infiltrated actor.")]
 		public readonly bool UseCenterPosition = false;
 
-		[Desc("If true, the spawned actor is destroyed if the parent actor dies, is sold, or is captured.")]
-		public readonly bool LinkedToParent = false;
-
 		public override object Create(ActorInitializer init) { return new InfiltrateToCreateProxyActor(this); }
 	}
 
-	class InfiltrateToCreateProxyActor : INotifyInfiltrated, INotifyRemovedFromWorld
+	class InfiltrateToCreateProxyActor : INotifyInfiltrated
 	{
 		readonly InfiltrateToCreateProxyActorInfo info;
-		List<Actor> spawnedActors;
 
 		public InfiltrateToCreateProxyActor(InfiltrateToCreateProxyActorInfo info)
 		{
 			this.info = info;
-			spawnedActors = new List<Actor>();
 		}
 
 		void INotifyInfiltrated.Infiltrated(Actor self, Actor infiltrator, BitSet<TargetableType> types)
@@ -95,16 +89,7 @@ void INotifyInfiltrated.Infiltrated(Actor self, Actor infiltrator, BitSet<Target
 			else if (info.UseLocation)
 				td.Add(new LocationInit(self.Location));
 
-			infiltrator.World.AddFrameEndTask(w => spawnedActors.Add(w.CreateActor(info.Proxy, td)));
-		}
-
-		void INotifyRemovedFromWorld.RemovedFromWorld(Actor self)
-		{
-			foreach (var a in spawnedActors)
-			{
-				if (!a.IsDead)
-					a.Dispose();
-			}
+			infiltrator.World.AddFrameEndTask(w => w.CreateActor(info.Proxy, td));
 		}
 	}
 }