Remove auras interrupted by falling when we fall to the ground or water (#19115)

This commit is contained in:
xinef1 authored and Aokromes committed 2017-03-03 01:31:13 +01:00
1 parent 04d3783664
commit 0642e5bd82
2 files changed
+4 -1

No files matched your search

@@ -25605,7 +25605,6 @@ void Player::HandleFall(MovementInfo const& movementInfo)
TC_LOG_DEBUG("entities.player", "FALLDAMAGE z=%f sz=%f pZ=%f FallTime=%d mZ=%f damage=%d SF=%d", movementInfo.pos.GetPositionZ(), height, GetPositionZ(), movementInfo.jump.fallTime, height, damage, safe_fall);
}
}
RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_LANDING); // No fly zone - Parachute
}
void Player::ResetAchievements()
@@ -372,6 +372,10 @@ void WorldSession::HandleMovementOpcodes(WorldPacket& recvPacket)
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