Ticket #4870: ticket4870.patch

binaries/data/mods/public/maps/random/rmgen/player.js

@@ -7 +7 @@
  */
 function getStartingEntities(playerID)
 {
-    return g_CivData[getCivCode(playerID)].StartEntities;
+    return g_CivData.brit.StartEntities;
 }
 
 /**

binaries/data/mods/public/simulation/ai/common-api/gamestate.js

@@ -810 +810 @@
  */
 m.GameState.prototype.findBuilder = function(template)
 {
+    let civ = this.getPlayerCiv();
     for (let ent of this.getOwnUnits().values())
     {
-        let buildable = ent.buildableEntities();
+        let buildable = ent.buildableEntities(civ);
         if (buildable && buildable.indexOf(template) !== -1)
             return ent;
     }

binaries/data/mods/public/simulation/ai/petra/queueplanBuilding.js

@@ -38 +38 @@
 {
     Engine.ProfileStart("Building construction start");
 
-    // We don't care which builder we assign, since they won't actually
-    // do the building themselves - all we care about is that there is
-    // at least one unit that can start the foundation
+    // We don't care which builder we assign, since they won't actually do
+    // the building themselves - all we care about is that there is at least
+    // one unit that can start the foundation (should always be the case here).
     let builder = gameState.findBuilder(this.type);
+    if (!builder)
+    {
+            API3.warn("petra error: builder not found when starting construction.");
+            Engine.ProfileStop();
+            return;
+    }
 
     let pos = this.findGoodPosition(gameState);
     if (!pos)

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

@@ -27 +27 @@
 Builder.prototype.GetEntitiesList = function()
 {
     let string = this.template.Entities._string;
-
     if (!string)
         return [];
 
-    let cmpIdentity = Engine.QueryInterface(this.entity, IID_Identity);
-    if (cmpIdentity)
-        string = string.replace(/\{civ\}/g, cmpIdentity.GetCiv());
-
-    let entities = string.split(/\s+/);
-
     let cmpPlayer = QueryOwnerInterface(this.entity);
     if (!cmpPlayer)
-        return entities;
+        return [];
 
+    let entities = string.replace(/\{civ\}/g, cmpPlayer.GetCiv()).split(/\s+/);
+
     let disabledTemplates = cmpPlayer.GetDisabledTemplates();
 
     let cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);