diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/MovementHandler.cpp | 3 | ||||
| -rw-r--r-- | src/game/OutdoorPvPNR.cpp | 1 | ||||
| -rw-r--r-- | src/game/Player.cpp | 1 | ||||
| -rw-r--r-- | src/game/SpellAuras.cpp | 2 | ||||
| -rw-r--r-- | src/game/Wintergrasp.cpp | 1 |
5 files changed, 4 insertions, 4 deletions
diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp index 69583263015..02a41d43923 100644 --- a/src/game/MovementHandler.cpp +++ b/src/game/MovementHandler.cpp @@ -307,10 +307,7 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data ) // fall damage generation (ignore in flight case that can be triggered also at lags in moment teleportation to another map). if (opcode == MSG_MOVE_FALL_LAND && plMover && !plMover->isInFlight()) - { plMover->HandleFall(movementInfo); - _player->RemoveAurasByType(SPELL_AURA_FEATHER_FALL); - } if (plMover && ((movementInfo.flags & MOVEMENTFLAG_SWIMMING) != 0) != plMover->IsInWater()) { diff --git a/src/game/OutdoorPvPNR.cpp b/src/game/OutdoorPvPNR.cpp index 4f16e407b29..fbcca4bdeff 100644 --- a/src/game/OutdoorPvPNR.cpp +++ b/src/game/OutdoorPvPNR.cpp @@ -37,6 +37,7 @@ void OutdoorPvPNR::HandlePlayerEnterZone(Player * plr, uint32 zone) { plr->CastSpell(plr, SPELL_NOFLYZONE, true); ChatHandler(plr).PSendSysMessage(LANG_ZONE_NOFLYZONE); + plr->GetSession()->SendNotification(LANG_ZONE_NOFLYZONE); } OutdoorPvP::HandlePlayerEnterZone(plr, zone); } diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 8f5ae3ac756..30b83e41dce 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -21177,6 +21177,7 @@ void Player::HandleFall(MovementInfo const& movementInfo) DEBUG_LOG("FALLDAMAGE z=%f sz=%f pZ=%f FallTime=%d mZ=%f damage=%d SF=%d" , movementInfo.z, height, GetPositionZ(), movementInfo.fallTime, height, damage, safe_fall); } } + RemoveAura(61243); // No fly zone - Parachute } void Player::UpdateAchievementCriteria( AchievementCriteriaTypes type, uint32 miscvalue1/*=0*/, uint32 miscvalue2/*=0*/, Unit *unit/*=NULL*/, uint32 time/*=0*/ ) diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 587dae3ed4c..e60717ac999 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -3350,7 +3350,7 @@ void AuraEffect::HandleAuraFeatherFall(bool apply, bool Real, bool /*changeAmoun float ground_Z = caster->GetMap()->GetVmapHeight(x, y, z, true); if (fabs(ground_Z - z) < 0.1f) { - m_target->RemoveAurasByType(SPELL_AURA_FEATHER_FALL); + m_target->RemoveAura(GetId()); return; } } diff --git a/src/game/Wintergrasp.cpp b/src/game/Wintergrasp.cpp index ec989a8123f..7498646754d 100644 --- a/src/game/Wintergrasp.cpp +++ b/src/game/Wintergrasp.cpp @@ -955,6 +955,7 @@ void OPvPWintergrasp::HandlePlayerEnterZone(Player * plr, uint32 zone) { plr->CastSpell(plr, SPELL_NOFLYZONE_WG, true); ChatHandler(plr).PSendSysMessage(LANG_ZONE_NOFLYZONE); + plr->GetSession()->SendNotification(LANG_ZONE_NOFLYZONE); } if (!isWarTime()) |