Ticket #4161: 0001-Remove-cmpPlayerManager.GetAllPlayerEntities-which-l.patch

binaries/data/mods/public/maps/scripts/ConquestCommon.js

@@ -10 +10 @@
         return;
 
     if (msg.to > 0 && this.conquestEntitiesByPlayer[msg.to])
-        this.conquestEntitiesByPlayer[msg.to].entities.push(msg.entity);
+        this.conquestEntitiesByPlayer[msg.to].push(msg.entity);
 
     if (!this.conquestEntitiesByPlayer[msg.from])
     {
@@ -19 +19 @@
         return; 
     }
 
-    let entities = this.conquestEntitiesByPlayer[msg.from].entities;
+    let entities = this.conquestEntitiesByPlayer[msg.from];
     let index = entities.indexOf(msg.entity);
 
     if (index >= 0)
@@ -54 +54 @@
         return; 
     }
 
-    if (this.conquestEntitiesByPlayer[player].entities.indexOf(msg.building) >= 0)
+    if (this.conquestEntitiesByPlayer[player].indexOf(msg.building) >= 0)
         return;
 
-    this.conquestEntitiesByPlayer[player].entities.push(msg.building);
+    this.conquestEntitiesByPlayer[player].push(msg.building);
 }
 
 Trigger.prototype.ConquestTrainingFinished = function(msg)
@@ -71 +71 @@
         warn("ConquestTrainingFinished: Unknown player " + player);
         return; 
     }
-    this.conquestEntitiesByPlayer[player].entities.push(...msg.entities);
+    this.conquestEntitiesByPlayer[player].push(...msg.entities);
 };
 
 Trigger.prototype.ConquestStartGameCount = function()
@@ -83 +83 @@
     }
 
     let cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
-    let cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
-
-    cmpPlayerManager.GetAllPlayerEntities().forEach((elem, i) => {
-        if (i == 0)
-            return;
 
+    let numPlayers = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager).GetNumPlayers();
+    for (let i = 0; i < numPlayers; ++i)
+    {
         let filterEntity = ent => TriggerHelper.EntityHasClass(ent, this.conquestClassFilter) 
             && !Engine.QueryInterface(ent, IID_Foundation);
-        this.conquestEntitiesByPlayer[i] = {"player" : elem, "entities" : [...cmpRangeManager.GetEntitiesByPlayer(i).filter(filterEntity)]};
-    });
+        this.conquestEntitiesByPlayer[i] = [...cmpRangeManager.GetEntitiesByPlayer(i).filter(filterEntity)];
+    }
 
     this.conquestDataInit = true;
 };

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

@@ -69 +69 @@
     if (!this.ceasefireIsActive)
     {
         // Save diplomacy
-        let playerEntities = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager).GetAllPlayerEntities();
-        for (let i = 1; i < playerEntities.length; ++i)
+        let numPlayers = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager).GetNumPlayers();
+        for (let i = 1; i < numPlayers; ++i)
             // Copy array with slice(), otherwise it will change
-            this.diplomacyBeforeCeasefire.push(Engine.QueryInterface(playerEntities[i], IID_Player).GetDiplomacy().slice());
+            this.diplomacyBeforeCeasefire.push(QueryPlayerIDInterface(i).GetDiplomacy().slice());
 
         // Set every enemy (except gaia) to neutral
-        for (let i = 1; i < playerEntities.length; ++i)
-            for (let j = 1; j < playerEntities.length; ++j)
+        for (let i = 1; i < numPlayers; ++i)
+            for (let j = 1; j < numPlayers; ++j)
                 if (this.diplomacyBeforeCeasefire[i-1][j] < 0)
-                    Engine.QueryInterface(playerEntities[i], IID_Player).SetNeutral(j);
+                    QueryPlayerIDInterface(i).SetNeutral(j);
     }
 
     this.ceasefireIsActive = true;
@@ -115 +115 @@
     }, this.postCountdownMessageDuration);
 
     // Reset diplomacies to original settings
-    let playerEntities = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager).GetAllPlayerEntities();
-    for (let i = 1; i < playerEntities.length; ++i)
-        Engine.QueryInterface(playerEntities[i], IID_Player).SetDiplomacy(this.diplomacyBeforeCeasefire[i-1]);
+    let numPlayers = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager).GetNumPlayers();
+    for (let i = 1; i < numPlayers; ++i)
+        QueryPlayerIDInterface(i).SetDiplomacy(this.diplomacyBeforeCeasefire[i-1]);
 
     this.ceasefireIsActive = false;
     this.ceasefireTime = 0;

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

@@ -232 +232 @@
  * Gets entities near a give point for given players.
  * @param {Vector2D} origin - the point to check around.
  * @param {number}   radius - the radius around the point to check.
- * @param {number[]} [players] - the players of which we need to check entities. If players is not included, entities from all players are used.
+ * @param {number[]} players - the players of which we need to check entities.
  * @return {number[]} - the id's of the entities in range of the given point.
  */
 Damage.prototype.EntitiesNearPoint = function(origin, radius, players)
 {
     // If there is insufficient data return an empty array.
-    if (!origin || !radius)
+    if (!origin || !radius || !players)
         return [];
 
-    // If the players parameter is not specified use all players.
-    if (!players)
-    {
-        let playerEntities = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager).GetAllPlayerEntities();
-        players = playerEntities.map((ent) => Engine.QueryInterface(ent, IID_Player).GetPlayerID());
-    }
-
     return Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager).ExecuteQueryAroundPos(origin, 0, radius, players, IID_DamageReceiver);
 };
 

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

@@ -104 +104 @@
     Engine.DestroyEntity(lastId);
 };
 
-PlayerManager.prototype.GetAllPlayerEntities = function()
-{
-    return this.playerEntities;
-};
 Engine.RegisterSystemComponentType(IID_PlayerManager, "PlayerManager", PlayerManager);

binaries/data/mods/public/simulation/components/tests/test_Damage.js

@@ -53 +53 @@
 
 AddMock(SYSTEM_ENTITY, IID_PlayerManager, {
     GetPlayerByID: (id) => atkPlayerEntity,
-    GetAllPlayerEntities: () => [attackerOwner, targetOwner],
 });
 
 AddMock(SYSTEM_ENTITY, IID_RangeManager, { 

binaries/data/mods/public/simulation/helpers/InitGame.js

@@ -11 +11 @@
     Engine.BroadcastMessage(MT_SkirmishReplace, {});
     Engine.FlushDestroyedEntities(); 
 
-    let cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
-    let playerIds = cmpPlayerManager.GetAllPlayerEntities().slice(1); // ignore gaia
-    for (let playerId of playerIds)
+    let numPlayers = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager).GetNumPlayers();
+    for (let i = 1; i < numPlayers; ++i) // ignore gaia
     {
-        let cmpTechnologyManager = Engine.QueryInterface(playerId, IID_TechnologyManager);
+        let cmpTechnologyManager = QueryPlayerIDInterface(i, IID_TechnologyManager);
         if (cmpTechnologyManager)
             cmpTechnologyManager.UpdateAutoResearch();
     }