epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crashing when transports are loaded via lua

Browse Source
This commit is contained in:
Gustas
2023-09-27 08:49:13 +03:00
committed by Paul Chote
parent 3904576574
commit 20f6e01afe
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Common/Traits/Air/Aircraft.cs
View File

@@ -1221,7 +1221,10 @@ namespace OpenRA.Mods.Common.Traits
Activity ICreationActivity.GetCreationActivity() Activity ICreationActivity.GetCreationActivity()
{ {
if (creationRallyPoint != null || creationActivityDelay > 0)
return new AssociateWithAirfieldActivity(self, creationActivityDelay, creationRallyPoint); return new AssociateWithAirfieldActivity(self, creationActivityDelay, creationRallyPoint);
return null;
} }
sealed class AssociateWithAirfieldActivity : Activity sealed class AssociateWithAirfieldActivity : Activity

6
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -1000,7 +1000,11 @@ namespace OpenRA.Mods.Common.Traits
Activity ICreationActivity.GetCreationActivity() 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 sealed class MoveOrderTargeter : IOrderTargeter