Simplify special exits of several acitivities.

2019-06-30 20:53:36 +02:00
parent 3790169db9
commit 985020b4ad
9 changed files with 20 additions and 45 deletions
--- a/OpenRA.Mods.Common/Activities/UnloadCargo.cs
+++ b/OpenRA.Mods.Common/Activities/UnloadCargo.cs
@@ -129,13 +129,13 @@ namespace OpenRA.Mods.Common.Activities

 			if (!unloadAll || !cargo.CanUnload())
 			{
-				Cancel(self, true);
-
 				if (cargo.Info.AfterUnloadDelay > 0)
 					QueueChild(new Wait(cargo.Info.AfterUnloadDelay, false));

 				if (takeOffAfterUnload)
 					QueueChild(new TakeOff(self));
+
+				return true;
 			}

 			return false;