*Fix Shattered Barrier

--HG--
branch : trunk

1 files changed, 12 insertions, 1 deletions

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index aa4ff05828a..d1cf3a14027 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -2181,7 +2181,7 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
         {
             if ((*i)->GetModifier()->m_amount<=0)
             {
-                pVictim->RemoveAurasDueToSpell((*i)->GetId());
+                pVictim->RemoveAurasByCasterSpell((*i)->GetId(), (*i)->GetCasterGUID());
                 i = vSchoolAbsorb.begin();
             }
             else
@@ -5376,6 +5376,17 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
                 triggered_spell_id = 29077;
                 break;
             }
+            // Shattered Barrier
+            if (dummySpell->SpellIconID == 2945)
+            {
+                // only on dispel/remove aura by sestroy
+                if (procEx & PROC_EX_AURA_REMOVE_EXPIRE && damage)
+                    return false;
+                target = NULL;
+                triggered_spell_id = 55080;
+                CastSpell(target, triggered_spell_id, true);
+                return true;
+            }
             // Hot Streak
             if (dummySpell->SpellIconID == 2999)
             {