From e636531da3603c10a9ebcb8a55d52d6cdb3a400a Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Sun, 8 Apr 2012 12:17:43 +0200 Subject: Core/Movement: Fix pushback issues and client freeze. --- src/server/game/Spells/Auras/SpellAuraEffects.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/server/game/Spells') diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 6fa6270c444..f41b4bc6c5f 100755 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -2856,9 +2856,8 @@ void AuraEffect::HandleAuraAllowFlight(AuraApplication const* aurApp, uint8 mode target->SetCanFly(apply); if (!apply) { - target->RemoveUnitMovementFlag(MOVEMENTFLAG_FLYING); - target->AddUnitMovementFlag(MOVEMENTFLAG_FALLING); - target->m_movementInfo.SetFallTime(0); + target->RemoveUnitMovementFlag(MOVEMENTFLAG_MASK_MOVING_FLY); + target->GetMotionMaster()->MoveFall(); } Player* player = target->ToPlayer(); @@ -2889,10 +2888,7 @@ void AuraEffect::HandleAuraWaterWalk(AuraApplication const* aurApp, uint8 mode, if (apply) target->AddUnitMovementFlag(MOVEMENTFLAG_WATERWALKING); else - { target->RemoveUnitMovementFlag(MOVEMENTFLAG_WATERWALKING); - target->AddUnitMovementFlag(MOVEMENTFLAG_FALLING); - } target->SendMovementWaterWalking(); } -- cgit v1.2.3