Ticket #4291: autogarrison.patch

binaries/data/mods/public/maps/random/danubius_triggers.js

@@ -259 +259 @@
 
         for (let template in unitCounts)
             for (let newEnt of TriggerHelper.SpawnUnits(gaiaEnt, "units/" + template, unitCounts[template], gaulPlayer))
-                Engine.QueryInterface(gaiaEnt, IID_GarrisonHolder).Garrison(newEnt);
+                if (Engine.QueryInterface(gaiaEnt, IID_GarrisonHolder).Garrison(newEnt))
+                    Engine.QueryInterface(newEnt, IID_UnitAI).Autogarrison(gaiaEnt);
     }
 };
 
@@ -427 +428 @@
                 if (spawn.hero)
                     this.heroes.push({ "template": spawn.template, "ent": ent });
 
-                cmpGarrisonHolder.Garrison(ent);
+                if (cmpGarrisonHolder.Garrison(ent))
+                    Engine.QueryInterface(ent, IID_UnitAI).Autogarrison(ship); 
             }
         }
     }

binaries/data/mods/public/simulation/components/GarrisonHolder.js

@@ -727 +727 @@
     {
         let cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI);
         if (cmpUnitAI && cmpUnitAI.CanGarrison(this.entity) && this.Garrison(ent))
-            cmpUnitAI.SetGarrisoned();
+            cmpUnitAI.Autogarrison(this.entity);
     }
     this.initGarrison = undefined;
 };