Fixed issue with unit ready when capturing

OpenRA.Game/Actor.cs

@@ -276,7 +276,14 @@ namespace OpenRA
 		// TODO: move elsewhere.
 		public void ChangeOwner(Player newOwner)
 		{
-			World.AddFrameEndTask(w =>
+			World.AddFrameEndTask(_ => ChangeOwnerSync(newOwner));
+		}
+
+		/// <summary>
+		/// Change the actors owner without queuing a FrameEndTask.
+		/// This must only be called from inside an existing FrameEndTask.
+		/// </summary>
+		public void ChangeOwnerSync(Player newOwner)
 		{
 			if (Disposed)
 				return;
@@ -286,7 +293,7 @@ namespace OpenRA
 
 			// momentarily remove from world so the ownership queries don't get confused
 			if (wasInWorld)
-					w.Remove(this);
+				World.Remove(this);
 
 			Owner = newOwner;
 			Generation++;
@@ -295,8 +302,7 @@ namespace OpenRA
 				t.OnOwnerChanged(this, oldOwner, newOwner);
 
 			if (wasInWorld)
-					w.Add(this);
-			});
+				World.Add(this);
 		}
 
 		public DamageState GetDamageState()

OpenRA.Mods.Common/Activities/ExternalCaptureActor.cs

@@ -67,8 +67,6 @@ namespace OpenRA.Mods.Common.Activities
 
 						var oldOwner = target.Actor.Owner;
 
-						target.Actor.ChangeOwner(self.Owner);
-
 						foreach (var t in target.Actor.TraitsImplementing<INotifyCapture>())
 							t.OnCapture(target.Actor, self, oldOwner, self.Owner);
 
@@ -83,6 +81,8 @@ namespace OpenRA.Mods.Common.Activities
 
 						if (capturesInfo != null && capturesInfo.ConsumeActor)
 							self.Dispose();
+
+						target.Actor.ChangeOwnerSync(self.Owner);
 					});
 				}
 			}