Added callback in Passenger during unload from cargo just before the …

…actor is added back to the world

OpenRA.Mods.Common/Activities/UnloadCargo.cs

@@ -119,11 +119,12 @@ public override bool Tick(Actor self)
 
 					var move = actor.Trait<IMove>();
 					var pos = actor.Trait<IPositionable>();
+					var passenger = actor.Trait<Passenger>();
 
 					pos.SetPosition(actor, exitSubCell.Value.Cell, exitSubCell.Value.SubCell);
 					pos.SetCenterPosition(actor, spawn);
 
-					actor.CancelActivity();
+					passenger.OnBeforeAddedToWorld(actor);
 					w.Add(actor);
 				});
 			}

OpenRA.Mods.Common/Traits/Cargo.cs

@@ -428,8 +428,7 @@ void INotifyKilled.Killed(Actor self, AttackInfo e)
 							foreach (var nbm in nbms)
 								nbm.OnNotifyBlockingMove(passenger, passenger);
 
-							// For show.
-							passenger.QueueActivity(new Nudge(passenger));
+							passenger.Trait<Passenger>().OnEjectedFromKilledCargo(passenger);
 						}
 						else
 							passenger.Kill(e.Attacker);

OpenRA.Mods.Common/Traits/Passenger.cs

@@ -207,6 +207,19 @@ public void Unreserve(Actor self)
 			ReservedCargo = null;
 		}
 
+		public virtual void OnBeforeAddedToWorld(Actor actor)
+		{
+			actor.CancelActivity();
+		}
+
+		public virtual void OnEjectedFromKilledCargo(Actor self)
+		{
+			// Cancel all other activities to keep consistent behavior with the one in UnloadCargo.
+			self.CurrentActivity?.Cancel(self);
+
+			self.QueueActivity(new Nudge(self));
+		}
+
 		void INotifyKilled.Killed(Actor self, AttackInfo e)
 		{
 			if (Transport == null)