Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7346 from cyberbrest/pull11

Browse Source 
[434][Object] Fix Freezes at loading chars and at teleportation (and by transport too;))
This commit is contained in:
Nay
2012-08-12 09:10:38 -07:00
parent 4396df127c fcbc45ec23
commit 706f3fa7d7
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/game/Entities/Player/Player.cpp
View File

@@ -2103,6 +2103,8 @@ void Player::SendTeleportPacket(Position &oldPos)
bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientation, uint32 options)
{
orientation = MapManager::NormalizeOrientation(orientation);
if (!MapManager::IsValidMapCoord(mapid, x, y, z, orientation))
{
sLog->outError(LOG_FILTER_MAPS, "TeleportTo: invalid map (%d) or invalid coordinates (X: %f, Y: %f, Z: %f, O: %f) given when teleporting player (GUID: %u, name: %s, map: %d, X: %f, Y: %f, Z: %f, O: %f).",
@@ -16699,7 +16701,11 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder)
// init saved position, and fix it later if problematic
uint32 transGUID = uint32(fields[31].GetUInt32());
Relocate(fields[12].GetFloat(), fields[13].GetFloat(), fields[14].GetFloat(), fields[16].GetFloat());
// used orientation 0-2pi range. Check for safe.
float orientation = MapManager::NormalizeOrientation(fields[16].GetFloat());
Relocate(fields[12].GetFloat(), fields[13].GetFloat(), fields[14].GetFloat(), orientation);
uint32 mapId = fields[15].GetUInt16();
uint32 instanceId = fields[54].GetUInt32();