Implement AURA_INTERRUPT_FLAG_LANDING

Fixes auto-off parachutes
cmangos · Feb 18, 2017 · b80a10e · b80a10e
1 parent 3f2a961
commit b80a10e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp
@@ -286,6 +286,10 @@ void WorldSession::HandleMovementOpcodes(WorldPacket& recv_data)
     if (opcode == MSG_MOVE_FALL_LAND && plMover && !plMover->IsTaxiFlying())
         plMover->HandleFall(movementInfo);
 
+    // Remove auras that should be removed at landing on ground or water
+    if (opcode == MSG_MOVE_FALL_LAND || opcode == MSG_MOVE_START_SWIM)
+        mover->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_LANDING); // Parachutes
+
     /* process position-change */
     HandleMoverRelocation(movementInfo);
 

diff --git a/src/game/Unit.h b/src/game/Unit.h
@@ -91,6 +91,7 @@ enum SpellAuraInterruptFlags
     AURA_INTERRUPT_FLAG_TELEPORTED                  = 0x00400000,   // 22
     AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT            = 0x00800000,   // 23   removed by entering pvp combat
     AURA_INTERRUPT_FLAG_DIRECT_DAMAGE               = 0x01000000    // 24   removed by any direct damage
+    AURA_INTERRUPT_FLAG_LANDING                     = 0x02000000,   // 25   removed by hitting the ground or water
 };
 
 enum SpellPartialResist