aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/MovementHandler.cpp
diff options
context:
space:
mode:
authorxinef1 <w.szyszko2@gmail.com>2017-03-02 00:08:12 +0100
committerariel- <ariel-@users.noreply.github.com>2017-03-01 20:08:12 -0300
commit9b284ab329b55b0c41f47d171573780205a3a81a (patch)
tree78c554d3bb89c6e3c22c1703a2087af3d1ab4598 /src/server/game/Handlers/MovementHandler.cpp
parent12c680f9b1f1068099c3b19443d93d456690ac56 (diff)
Remove auras interrupted by falling when we fall to the ground or water (#19115)
Diffstat (limited to 'src/server/game/Handlers/MovementHandler.cpp')
-rw-r--r--src/server/game/Handlers/MovementHandler.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp
index 69918e81555..d9e30ad79e9 100644
--- a/src/server/game/Handlers/MovementHandler.cpp
+++ b/src/server/game/Handlers/MovementHandler.cpp
@@ -348,6 +348,10 @@ void WorldSession::HandleMovementOpcodes(WorldPacket& recvData)
if (opcode == MSG_MOVE_FALL_LAND && plrMover && !plrMover->IsInFlight())
plrMover->HandleFall(movementInfo);
+ // interrupt parachutes upon falling or landing in water
+ if (opcode == MSG_MOVE_FALL_LAND || opcode == MSG_MOVE_START_SWIM)
+ mover->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_LANDING); // Parachutes
+
if (plrMover && ((movementInfo.flags & MOVEMENTFLAG_SWIMMING) != 0) != plrMover->IsInWater())
{
// now client not include swimming flag in case jumping under water