Ticket #3799: 3799.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);
 
@@ -262 +265 @@
         var affectedPlayers = this.GetAffectedPlayers(name);
 
         if (!affectedPlayers.length)
             continue;
 
-        if (!this.IsRangeAura(name))
-            continue;
+        if (this.IsGarrisonedUnitsAura(name) || this.IsGarrisonAura(name) || this.IsFormationAura(name))
+            this.ApplyBonus(name, targetUnitsClone[name]);
 
         this[name].rangeQuery = cmpRangeManager.CreateActiveQuery(
             this.entity,
             0,
             this.GetRange(name),