Vehicle/Spell: Fix case of vehicle not entering same phase on phase c…

…hange
Grz3s · Nov 29, 2024 · cac4393 · cac4393
1 parent ff294a2
commit cac4393
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/game/Entities/Unit.cpp b/src/game/Entities/Unit.cpp
@@ -6067,7 +6067,8 @@ void Unit::RemoveNotOwnTrackedTargetAuras(uint32 newPhase)
                     continue;
                 }
                 Unit* itr_target = GetMap()->GetUnit(itr_targetGuid);
-                if (!itr_target || !itr_target->InSamePhase(newPhase))
+                // vehicles follow owner into phase
+                if (!itr_target || (type != TRACK_AURA_TYPE_CONTROL_VEHICLE && !itr_target->InSamePhase(newPhase)))
                 {
                     scTargets.erase(itr);               // remove for caster in any case
 
@@ -11814,10 +11815,10 @@ void Unit::SetPhaseMask(uint32 newPhaseMask, bool update)
 
     if (IsInWorld())
     {
-        RemoveNotOwnTrackedTargetAuras(newPhaseMask);       // we can lost access to caster or target
-
         // all controlled except not owned charmed units
         CallForAllControlledUnits(SetPhaseMaskHelper(newPhaseMask), CONTROLLED_PET | CONTROLLED_GUARDIANS | CONTROLLED_MINIPET | CONTROLLED_TOTEMS);
+
+        RemoveNotOwnTrackedTargetAuras(newPhaseMask);       // we can lost access to caster or target
     }
 
     WorldObject::SetPhaseMask(newPhaseMask, update);

diff --git a/src/game/Spells/SpellAuras.cpp b/src/game/Spells/SpellAuras.cpp
@@ -9454,7 +9454,7 @@ void Aura::HandlePhase(bool apply, bool Real)
         for (auto itr = phases.begin(); itr != phases.end(); ++itr)
             newPhase |= (*itr)->GetMiscValue();
 
-    target->SetPhaseMask(newPhase ? newPhase : uint32(PHASEMASK_NORMAL), true);
+    target->SetPhaseMask(newPhase ? newPhase : uint32(PHASEMASK_NORMAL), false);
 
     if (apply)
     {
@@ -9475,6 +9475,9 @@ void Aura::HandlePhase(bool apply, bool Real)
                 itr->second->ApplyOrRemoveSpellIfCan((Player*)target, zone, area, false);
         }
     }
+
+    if (target->IsInWorld())
+        target->UpdateVisibilityAndView();
 }
 
 void Aura::HandleAuraDetaunt(bool /*Apply*/, bool Real)