From 0748e7f82071e4bdd47820e08df0e0232ef54ee3 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Fri, 17 Feb 2017 09:39:09 +0100 Subject: [PATCH] Added some missing SetFallInformation calls Fixed HP drop bug on zeppelins Fixed possible packet relocation problems on huge transports --- src/server/game/Entities/Player/Player.cpp | 4 ++-- src/server/game/Entities/Transport/Transport.cpp | 8 +++++++- src/server/game/Handlers/MovementHandler.cpp | 11 ++++++++++- .../MovementGenerators/WaypointMovementGenerator.cpp | 1 + src/server/game/Spells/SpellEffects.cpp | 8 ++++++++ 5 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 22a3f2a7ba4..37070ba4c03 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -1931,7 +1931,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati // this will be used instead of the current location in SaveToDB m_teleport_dest = WorldLocation(mapid, x, y, z, orientation); - SetFallInformation(0, z); + SetFallInformation(0, GetPositionZ()); // code for finish transfer called in WorldSession::HandleMovementOpcodes() // at client packet CMSG_MOVE_TELEPORT_ACK @@ -2044,7 +2044,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati oldmap->RemovePlayerFromMap(this, false); m_teleport_dest = WorldLocation(mapid, x, y, z, orientation); - SetFallInformation(0, z); + SetFallInformation(0, GetPositionZ()); // if the player is saved before worldportack (at logout for example) // this will be used instead of the current location in SaveToDB diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp index e64c3f94245..e53f9ea8bf9 100644 --- a/src/server/game/Entities/Transport/Transport.cpp +++ b/src/server/game/Entities/Transport/Transport.cpp @@ -284,7 +284,10 @@ void Transport::RemovePassenger(WorldObject* passenger) TC_LOG_DEBUG("entities.transport", "Object %s removed from transport %s.", passenger->GetName().c_str(), GetName().c_str()); if (Player* plr = passenger->ToPlayer()) + { sScriptMgr->OnRemovePassenger(this, plr); + plr->SetFallInformation(0, plr->GetPositionZ()); + } } } @@ -722,8 +725,11 @@ void Transport::UpdatePassengerPositions(PassengerSet& passengers) } case TYPEID_PLAYER: //relocate only passengers in world and skip any player that might be still logging in/teleporting - if (passenger->IsInWorld()) + if (passenger->IsInWorld() && !passenger->ToPlayer()->IsBeingTeleported()) + { GetMap()->PlayerRelocation(passenger->ToPlayer(), x, y, z, o); + passenger->ToPlayer()->SetFallInformation(0, passenger->GetPositionZ()); + } break; case TYPEID_GAMEOBJECT: GetMap()->GameObjectRelocation(passenger->ToGameObject(), x, y, z, o, false); diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp index 1277e1fe671..68dc7601287 100644 --- a/src/server/game/Handlers/MovementHandler.cpp +++ b/src/server/game/Handlers/MovementHandler.cpp @@ -89,6 +89,7 @@ void WorldSession::HandleMoveWorldportAckOpcode() if (GetPlayer()->HasUnitMovementFlag(MOVEMENTFLAG_HOVER)) z += GetPlayer()->GetFloatValue(UNIT_FIELD_HOVERHEIGHT); GetPlayer()->Relocate(loc.GetPositionX(), loc.GetPositionY(), z, loc.GetOrientation()); + GetPlayer()->SetFallInformation(0, GetPlayer()->GetPositionZ()); GetPlayer()->ResetMap(); GetPlayer()->SetMap(newMap); @@ -248,6 +249,7 @@ void WorldSession::HandleMoveTeleportAck(WorldPacket& recvPacket) WorldLocation const& dest = plMover->GetTeleportDest(); plMover->UpdatePosition(dest, true); + plMover->SetFallInformation(0, GetPlayer()->GetPositionZ()); uint32 newzone, newarea; plMover->GetZoneAndAreaId(newzone, newarea); @@ -316,9 +318,16 @@ void WorldSession::HandleMovementOpcodes(WorldPacket& recvPacket) /* handle special cases */ if (movementInfo.transport.guid) { + // We were teleported, skip packets that were broadcast before teleport + if (movementInfo.pos.GetExactDist2d(mover) > SIZE_OF_GRIDS) + { + recvData.rfinish(); // prevent warnings spam + return; + } + // transports size limited // (also received at zeppelin leave by some reason with t_* as absolute in continent coordinates, can be safely skipped) - if (movementInfo.transport.pos.GetPositionX() > 50 || movementInfo.transport.pos.GetPositionY() > 50 || movementInfo.transport.pos.GetPositionZ() > 50) + if (fabs(movementInfo.transport.pos.GetPositionX()) > 75.0f || fabs(movementInfo.transport.pos.GetPositionY()) > 75.0f || fabs(movementInfo.transport.pos.GetPositionZ()) > 75.0f) { recvPacket.rfinish(); // prevent warnings spam return; diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp index f4891228e4f..11c70c0d331 100755 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp @@ -329,6 +329,7 @@ void FlightPathMovementGenerator::DoFinalize(Player* player) // this prevent cheating with landing point at lags // when client side flight end early in comparison server side player->StopMoving(); + player->SetFallInformation(0, player->GetPositionZ()); } player->RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_TAXI_BENCHMARK); diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index cdd9808f7c3..97b108381b3 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -4465,6 +4465,10 @@ void Spell::EffectCharge(SpellEffIndex /*effIndex*/) if (effectHandleMode == SPELL_EFFECT_HANDLE_LAUNCH_TARGET) { + // charge changes fall time + if (m_caster->GetTypeId() == TYPEID_PLAYER) + m_caster->ToPlayer()->SetFallInformation(0, m_caster->GetPositionZ()); + float speed = G3D::fuzzyGt(m_spellInfo->Speed, 0.0f) ? m_spellInfo->Speed : SPEED_CHARGE; // Spell is not using explicit target - no generated path if (m_preGeneratedPath.GetPathType() == PATHFIND_BLANK) @@ -4555,6 +4559,10 @@ void Spell::EffectLeapBack(SpellEffIndex effIndex) float speedz = damage/ 10.f; //1891: Disengage unitTarget->JumpTo(speedxy, speedz, m_spellInfo->SpellIconID != 1891); + + // changes fall time + if (m_caster->GetTypeId() == TYPEID_PLAYER) + m_caster->ToPlayer()->SetFallInformation(0, m_caster->GetPositionZ()); } void Spell::EffectQuestClear(SpellEffIndex effIndex)