From e33f22ac7d92b482aaa546fd02d84d50eb926c90 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Fri, 16 Nov 2018 10:50:24 +0100 Subject: [PATCH] Core/Movement: enable packetOnly parameter for SetCanFly --- src/server/game/Entities/Unit/Unit.cpp | 40 +++++++++---------- .../game/Spells/Auras/SpellAuraEffects.cpp | 3 ++ 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 42a9804a0b..b2fbaf6a9c 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -12841,7 +12841,7 @@ void Unit::KnockbackFrom(float x, float y, float speedXY, float speedZ) SendMoveKnockBack(player, speedXY, -speedZ, vcos, vsin); if (player->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED) || player->HasAuraType(SPELL_AURA_FLY)) - player->SetCanFly(true, true); + player->SetCanFly(true, false); } } @@ -14334,28 +14334,28 @@ bool Unit::SetSwim(bool enable) return true; } -bool Unit::SetCanFly(bool enable, bool /*packetOnly = false */) +bool Unit::SetCanFly(bool enable, bool packetOnly) { - if (enable == HasUnitMovementFlag(MOVEMENTFLAG_CAN_FLY)) - return false; - - if (enable) + if (!packetOnly) { - AddUnitMovementFlag(MOVEMENTFLAG_CAN_FLY); - RemoveUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_SPLINE_ELEVATION); - AddExtraUnitMovementFlag(MOVEMENTFLAG2_CAN_SWIM_TO_FLY_TRANS); - SetFall(false); - } - else - { - RemoveUnitMovementFlag(MOVEMENTFLAG_CAN_FLY | MOVEMENTFLAG_MASK_MOVING_FLY); - RemoveExtraUnitMovementFlag(MOVEMENTFLAG2_CAN_SWIM_TO_FLY_TRANS); - if (!IsLevitating()) - SetFall(true); - } + if (enable == HasUnitMovementFlag(MOVEMENTFLAG_CAN_FLY)) + return false; - if (GetTypeId() == TYPEID_PLAYER) - ToPlayer()->SendMovementSetCanTransitionBetweenSwimAndFly(enable); + if (enable) + { + AddUnitMovementFlag(MOVEMENTFLAG_CAN_FLY); + RemoveUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_SPLINE_ELEVATION); + AddExtraUnitMovementFlag(MOVEMENTFLAG2_CAN_SWIM_TO_FLY_TRANS); + SetFall(false); + } + else + { + RemoveUnitMovementFlag(MOVEMENTFLAG_CAN_FLY | MOVEMENTFLAG_MASK_MOVING_FLY); + RemoveExtraUnitMovementFlag(MOVEMENTFLAG2_CAN_SWIM_TO_FLY_TRANS); + if (!IsLevitating()) + SetFall(true); + } + } if (enable) Movement::PacketSender(this, SMSG_SPLINE_MOVE_SET_FLYING, SMSG_MOVE_SET_CAN_FLY).Send(); diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index c31e6ed3f4..da65a8b27a 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -2724,6 +2724,9 @@ void AuraEffect::HandleAuraAllowFlight(AuraApplication const* aurApp, uint8 mode return; } + if (target->GetTypeId() == TYPEID_PLAYER) + target->ToPlayer()->SendMovementSetCanTransitionBetweenSwimAndFly(apply); + target->SetCanFly(apply); if (!apply && target->GetTypeId() == TYPEID_UNIT && !target->IsLevitating())