Ticket #4161: 0004-Prevent-leaking-internal-data-in-cmpPlayer.patch

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

@@ -71 +71 @@
         // Save diplomacy
         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(QueryPlayerIDInterface(i).GetDiplomacy().slice());
+            this.diplomacyBeforeCeasefire.push(QueryPlayerIDInterface(i).GetDiplomacy());
 
         // Set every enemy (except gaia) to neutral
         for (let i = 1; i < numPlayers; ++i)

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

@@ -460 +460 @@
 
 Player.prototype.GetDiplomacy = function()
 {
-    return this.diplomacy;
+    return this.diplomacy.slice();
 };
 
 Player.prototype.SetDiplomacy = function(dipl)
 {
-    this.diplomacy = dipl;
+    this.diplomacy = dipl.slice();
 
     Engine.BroadcastMessage(MT_DiplomacyChanged, {
         "player": this.playerID,

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

@@ -7 +7 @@
 
 TS_ASSERT_EQUALS(cmpPlayer.GetPopulationCount(), 0);
 TS_ASSERT_EQUALS(cmpPlayer.GetPopulationLimit(), 0);
+
+cmpPlayer.SetDiplomacy([-1, 1, 0, 1, -1]);
+
+var diplo = cmpPlayer.GetDiplomacy();
+diplo[0] = 1;
+TS_ASSERT(cmpPlayer.IsEnemy(0));
+
+diplo = [1, 1, 0];
+cmpPlayer.SetDiplomacy(diplo);
+diplo[1] = -1;
+TS_ASSERT(cmpPlayer.IsAlly(1));