Fix crashing when transports are loaded via lua

OpenRA · Sep 27, 2023 · 73c0c31 · 73c0c31
1 parent 686040a
commit 73c0c31
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs
@@ -1221,7 +1221,10 @@ void IActorPreviewInitModifier.ModifyActorPreviewInit(Actor self, TypeDictionary
 
 		Activity ICreationActivity.GetCreationActivity()
 		{
-			return new AssociateWithAirfieldActivity(self, creationActivityDelay, creationRallyPoint);
+			if (creationRallyPoint != null || creationActivityDelay > 0)
+				return new AssociateWithAirfieldActivity(self, creationActivityDelay, creationRallyPoint);
+
+			return null;
 		}
 
 		sealed class AssociateWithAirfieldActivity : Activity

diff --git a/OpenRA.Mods.Common/Traits/Mobile.cs b/OpenRA.Mods.Common/Traits/Mobile.cs
@@ -1000,7 +1000,11 @@ protected override void OnFirstRun(Actor self)
 
 		Activity ICreationActivity.GetCreationActivity()
 		{
-			return new LeaveProductionActivity(self, creationActivityDelay, creationRallypoint, returnToCellOnCreation ? new ReturnToCellActivity(self, creationActivityDelay, returnToCellOnCreationRecalculateSubCell) : null);
+			if (returnToCellOnCreation || creationRallypoint != null || creationActivityDelay > 0)
+				return new LeaveProductionActivity(self, creationActivityDelay, creationRallypoint,
+					returnToCellOnCreation ? new ReturnToCellActivity(self, creationActivityDelay, returnToCellOnCreationRecalculateSubCell) : null);
+
+			return null;
 		}
 
 		sealed class MoveOrderTargeter : IOrderTargeter