Core/Movement: Allow entering water from flying mounts and druid flight form

1 files changed, 4 insertions, 0 deletions

diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 06c7a88540a..834225c3d10 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -2637,6 +2637,8 @@ void AuraEffect::HandleAuraAllowFlight(AuraApplication const* aurApp, uint8 mode
             return;
     }
 
+    target->SetCanTransitionBetweenSwimAndFly(apply);
+
     if (target->SetCanFly(apply))
         if (!apply && !target->IsLevitating())
             target->GetMotionMaster()->MoveFall();
@@ -3076,6 +3078,8 @@ void AuraEffect::HandleAuraModIncreaseFlightSpeed(AuraApplication const* aurApp,
         // do not remove unit flag if there are more than this auraEffect of that kind on unit on unit
         if (mode & AURA_EFFECT_HANDLE_SEND_FOR_CLIENT_MASK && (apply || (!target->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED) && !target->HasAuraType(SPELL_AURA_FLY))))
         {
+            target->SetCanTransitionBetweenSwimAndFly(apply);
+
             if (target->SetCanFly(apply))
                 if (!apply && !target->IsLevitating())
                     target->GetMotionMaster()->MoveFall();