Ticket #3799: 3799.2.diff

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

@@ -215 +215 @@
  */
 Auras.prototype.Clean = function()
 {
     var cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
     var auraNames = this.GetAuraNames();
+    let targetUnitsClone = {};
     // remove all bonuses
     for (let name of auraNames)
     {
+        targetUnitsClone[name] = [];
         if (!this[name])
             continue;
 
+        targetUnitsClone[name] = this[name].targetUnits.slice(0);
         if (this.IsGlobalAura(name))
             this.RemoveTemplateBonus(name);
 
         this.RemoveBonus(name, this[name].targetUnits);
 
@@ -263 +266 @@
 
         if (!affectedPlayers.length)
             continue;
 
         if (!this.IsRangeAura(name))
+        {
+            this.ApplyBonus(name, targetUnitsClone[name]);
             continue;
+        }
 
         this[name].rangeQuery = cmpRangeManager.CreateActiveQuery(
             this.entity,
             0,
             this.GetRange(name),
@@ -277 +283 @@
         );
         cmpRangeManager.EnableActiveQuery(this[name].rangeQuery);
 
         if (this.IsGlobalAura(name))
         {
-            // update stats in for all templates 
+            // update stats in for all templates
             this.ApplyTemplateBonus(name, affectedPlayers);
             // Add self to your own query for consistency with templates.
-            this.OnRangeUpdate({"tag":this[name].rangeQuery, "added":[this.entity], "removed":[]});
+            this.OnRangeUpdate({ "tag": this[name].rangeQuery, "added": [this.entity], "removed": [] });
         }
     }
 };
 
 Auras.prototype.GiveMembersWithValidClass = function(auraName, entityList)