Spell: Make phase auras stackable

This will definitely cause issues but it is correct vs all evidence
cmangos · Jun 23, 2024 · 8816bec · 8816bec
1 parent 1198fd1
commit 8816bec
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/src/game/Spells/SpellAuras.cpp b/src/game/Spells/SpellAuras.cpp
@@ -9500,15 +9500,14 @@ void Aura::HandlePhase(bool apply, bool Real)
 
     Unit* target = GetTarget();
 
-    // always non stackable
-    if (apply)
-    {
-        Unit::AuraList const& phases = target->GetAurasByType(SPELL_AURA_PHASE);
-        if (!phases.empty())
-            target->RemoveAurasDueToSpell(phases.front()->GetId(), GetHolder());
-    }
-
-    target->SetPhaseMask(apply ? GetMiscValue() : uint32(PHASEMASK_NORMAL), true);
+    // 57673 and 56678 - specifically stack
+    uint32 newPhase = 0;
+    Unit::AuraList const& phases = target->GetAurasByType(SPELL_AURA_PHASE);
+    if (!phases.empty())
+        for (auto itr = phases.begin(); itr != phases.end(); ++itr)
+            newPhase |= (*itr)->GetMiscValue();
+
+    target->SetPhaseMask(newPhase ? newPhase : uint32(PHASEMASK_NORMAL), true);
     // no-phase is also phase state so same code for apply and remove
     if (target->GetTypeId() == TYPEID_PLAYER)
     {