aboutsummaryrefslogtreecommitdiff
path: root/src/game/MovementHandler.cpp
diff options
context:
space:
mode:
authorQAston <none@none>2009-07-18 15:00:36 +0200
committerQAston <none@none>2009-07-18 15:00:36 +0200
commit8499812eb665f0e9a7078f642d817041b67e89ec (patch)
treef7fb8d6c98fdc72c52603e3bfa49b6db99589b77 /src/game/MovementHandler.cpp
parent7b1a8420416ea101705da0d7a28b307c7f90592f (diff)
*Update heal calculation formula for Death Strike and apply improved death strike bonus if avalible
*Use floor() function for rounding in rep gain calculation *Add some debug info to WorldSession::HandleMoveWorldportAckOpcode() --HG-- branch : trunk
Diffstat (limited to 'src/game/MovementHandler.cpp')
-rw-r--r--src/game/MovementHandler.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp
index 08c884c7c55..58bc5004e1f 100644
--- a/src/game/MovementHandler.cpp
+++ b/src/game/MovementHandler.cpp
@@ -67,7 +67,13 @@ void WorldSession::HandleMoveWorldportAckOpcode()
GetPlayer()->SetSemaphoreTeleportFar(false);
// relocate the player to the teleport destination
- GetPlayer()->SetMap(MapManager::Instance().CreateMap(loc.mapid, GetPlayer())); GetPlayer()->Relocate(loc.coord_x, loc.coord_y, loc.coord_z, loc.orientation);
+ Map * newMap = MapManager::Instance().CreateMap(loc.mapid, GetPlayer());
+ if (!newMap)
+ {
+ sLog.outCrash("map %d could not be created for player "UI64FMTD, loc.mapid, GetPlayer()->GetGUID());
+ assert (false);
+ }
+ GetPlayer()->SetMap(newMap);
GetPlayer()->Relocate(loc.coord_x, loc.coord_y, loc.coord_z, loc.orientation);
GetPlayer()->SendInitialPacketsBeforeAddToMap();