Ticket #1910: 1910_splash_damage_broken.patch

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

@@ -545 +545 @@
         };
         if (this.template.Ranged.Splash)
         {
-            data.friendlyFire = this.template.Ranged.Splash.FriendlyFire;
+            data.friendlyFire = this.template.Ranged.Splash.FriendlyFire != "false";
             data.radius = +this.template.Ranged.Splash.Range;
             data.shape = this.template.Ranged.Splash.Shape;
             data.isSplash = true;

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

@@ -87 +87 @@
     // Do this first in case the direct hit kills the target
     if (data.isSplash)
     {
-        let playersToDamage = !data.friendlyFire ? QueryPlayerIDInterface(data.attackerOwner).GetEnemies() : null;
+        let playersToDamage = [];
+        if (!data.friendlyFire)
+            playersToDamage = QueryPlayerIDInterface(data.attackerOwner).GetEnemies();
+        else
+        {
+            let numPlayers = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager).GetNumPlayers();
+            for (let i = 0; i < numPlayers; ++i)
+                playersToDamage.push(i);
+        }
 
         this.CauseSplashDamage({
             "attacker": data.attacker,
@@ -148 +156 @@
  * @param {string}   data.type - the type of damage.
  * @param {number}   data.attackerOwner - the player id of the attacker.
  * @param {Vector3D} data.direction - the unit vector defining the direction.
- * @param {number[]} [data.playersToDamage] - the array of player id's to damage.
+ * @param {number[]} data.playersToDamage - the array of player id's to damage.
  */
 Damage.prototype.CauseSplashDamage = function(data)
 {