diff options
| -rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 22 | ||||
| -rwxr-xr-x | src/server/game/Entities/Player/Player.h | 3 |
2 files changed, 0 insertions, 25 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index efa792bc59e..c434105610c 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -2052,28 +2052,6 @@ void Player::SendTeleportAckPacket() GetSession()->SendPacket(&data); } -// this is not used anywhere -void Player::TeleportOutOfMap(Map* oldMap) -{ - while (IsBeingTeleportedFar()) - GetSession()->HandleMoveWorldportAckOpcode(); - - if (GetMap() != oldMap) - return; - - TeleportTo(m_homebindMapId, m_homebindX, m_homebindY, m_homebindZ, GetOrientation()); - - while (IsBeingTeleportedFar()) - GetSession()->HandleMoveWorldportAckOpcode(); - - if (GetMap() == oldMap) - { - sLog->outCrash("Cannot teleport player out of map!"); - ResetMap(); - ASSERT(false); - } -} - bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientation, uint32 options) { if (!MapManager::IsValidMapCoord(mapid, x, y, z, orientation)) diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 651b99e7cb4..2b84a116ee8 100755 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1091,13 +1091,10 @@ class Player : public Unit, public GridObject<Player> void RemoveFromWorld(); bool TeleportTo(uint32 mapid, float x, float y, float z, float orientation, uint32 options = 0); - void TeleportOutOfMap(Map* oldMap); - bool TeleportTo(WorldLocation const &loc, uint32 options = 0) { return TeleportTo(loc.GetMapId(), loc.GetPositionX(), loc.GetPositionY(), loc.GetPositionZ(), loc.GetOrientation(), options); } - bool TeleportToBGEntryPoint(); void SetSummonPoint(uint32 mapid, float x, float y, float z) |