mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-16 07:30:42 +01:00
DB/World: Update quest template for 6.1.2 19865 part 7
This commit is contained in:
1277
sql/updates/world/2015_05_02_01_world.sql
Normal file
1277
sql/updates/world/2015_05_02_01_world.sql
Normal file
File diff suppressed because one or more lines are too long
@@ -347,10 +347,8 @@ public:
|
||||
|
||||
mapId = data.MapID;
|
||||
|
||||
Map const* map = sMapMgr->CreateBaseMap(mapId);
|
||||
x = data.points.front().X;
|
||||
y = data.points.front().Y;
|
||||
z = std::max(map->GetHeight(x, y, MAX_HEIGHT), map->GetWaterLevel(x, y));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -359,7 +357,7 @@ public:
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!MapManager::IsValidMapCoord(mapId, x, y, z) || sObjectMgr->IsTransportMap(mapId))
|
||||
if (!MapManager::IsValidMapCoord(mapId, x, y) || sObjectMgr->IsTransportMap(mapId))
|
||||
{
|
||||
handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapId);
|
||||
handler->SetSentErrorMessage(true);
|
||||
@@ -376,6 +374,9 @@ public:
|
||||
else
|
||||
player->SaveRecallPosition();
|
||||
|
||||
Map const* map = sMapMgr->CreateBaseMap(mapId);
|
||||
z = std::max(map->GetHeight(x, y, MAX_HEIGHT), map->GetWaterLevel(x, y));
|
||||
|
||||
player->TeleportTo(mapId, x, y, z, 0.0f);
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user