Spell: Make phase change apply to root vehicle and change bg flag dro…

…p hack
cmangos · Nov 28, 2024 · cb2a777 · cb2a777
1 parent 28132e8
commit cb2a777
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/game/Entities/Player.cpp b/src/game/Entities/Player.cpp
@@ -21268,11 +21268,10 @@ void Player::SetPhaseMask(uint32 newPhaseMask, bool update)
     if (IsGameMaster())
         newPhaseMask = static_cast<uint32>(PHASEMASK_ANYWHERE);
 
-    // phase auras normally not expected at BG but anyway better check
-    if (BattleGround* bg = GetBattleGround())
-        bg->HandlePlayerDroppedFlag(this);
-
     Unit::SetPhaseMask(newPhaseMask, update);
+
+    if (Unit* vehicle = const_cast<Unit*>(FindRootVehicle()))
+        vehicle->SetPhaseMask(newPhaseMask, update);
     GetSession()->SendSetPhaseShift(GetPhaseMask());
 }
 

diff --git a/src/game/Spells/SpellAuras.cpp b/src/game/Spells/SpellAuras.cpp
@@ -9455,6 +9455,13 @@ void Aura::HandlePhase(bool apply, bool Real)
             newPhase |= (*itr)->GetMiscValue();
 
     target->SetPhaseMask(newPhase ? newPhase : uint32(PHASEMASK_NORMAL), true);
+
+    if (apply)
+    {
+        // drop flag at invisibiliy in bg
+        target->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_STEALTH_INVIS_CANCELS);
+    }
+
     // no-phase is also phase state so same code for apply and remove
     if (target->GetTypeId() == TYPEID_PLAYER)
     {