diff options
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 53 |
1 files changed, 34 insertions, 19 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index dffae64da64..bbbe298a932 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -58,6 +58,7 @@ #include "SpellScript.h" #include "TemporarySummon.h" #include "Timer.h" +#include "TransportMgr.h" #include "Vehicle.h" #include "VMapFactory.h" #include "World.h" @@ -3475,8 +3476,8 @@ void ObjectMgr::LoadPlayerInfo() // Load playercreate { uint32 oldMSTime = getMSTime(); - // 0 1 2 3 4 5 6 - QueryResult result = WorldDatabase.Query("SELECT race, class, map, zone, position_x, position_y, position_z, orientation FROM playercreateinfo"); + // 0 1 2 3 4 5 6 7 8 9 10 11 12 + QueryResult result = WorldDatabase.Query("SELECT race, class, map, position_x, position_y, position_z, orientation, npe_map, npe_position_x, npe_position_y, npe_position_z, npe_orientation, npe_transport_guid FROM playercreateinfo"); if (!result) { @@ -3494,11 +3495,10 @@ void ObjectMgr::LoadPlayerInfo() uint32 current_race = fields[0].GetUInt8(); uint32 current_class = fields[1].GetUInt8(); uint32 mapId = fields[2].GetUInt16(); - uint32 areaId = fields[3].GetUInt32(); // zone - float positionX = fields[4].GetFloat(); - float positionY = fields[5].GetFloat(); - float positionZ = fields[6].GetFloat(); - float orientation = fields[7].GetFloat(); + float positionX = fields[3].GetFloat(); + float positionY = fields[4].GetFloat(); + float positionZ = fields[5].GetFloat(); + float orientation = fields[6].GetFloat(); if (!sChrRacesStore.LookupEntry(current_race)) { @@ -3525,29 +3525,44 @@ void ObjectMgr::LoadPlayerInfo() continue; } - ChrModelEntry const* maleModel = sDB2Manager.GetChrModel(current_race, GENDER_MALE); - if (!maleModel) + if (!sDB2Manager.GetChrModel(current_race, GENDER_MALE)) { TC_LOG_ERROR("sql.sql", "Missing male model for race %u, ignoring.", current_race); continue; } - ChrModelEntry const* femaleModel = sDB2Manager.GetChrModel(current_race, GENDER_FEMALE); - if (!femaleModel) + if (!sDB2Manager.GetChrModel(current_race, GENDER_FEMALE)) { TC_LOG_ERROR("sql.sql", "Missing female model for race %u, ignoring.", current_race); continue; } std::unique_ptr<PlayerInfo> info = std::make_unique<PlayerInfo>(); - info->mapId = mapId; - info->areaId = areaId; - info->positionX = positionX; - info->positionY = positionY; - info->positionZ = positionZ; - info->orientation = orientation; - info->displayId_m = maleModel->DisplayID; - info->displayId_f = femaleModel->DisplayID; + info->createPosition.Loc.WorldRelocate(mapId, positionX, positionY, positionZ, orientation); + + if (std::none_of(fields + 7, fields + 12, [](Field const& field) { return field.IsNull(); })) + { + info->createPositionNPE.emplace(); + + info->createPositionNPE->Loc.WorldRelocate(fields[7].GetUInt32(), fields[8].GetFloat(), fields[9].GetFloat(), fields[10].GetFloat(), fields[11].GetFloat()); + if (!fields[12].IsNull()) + info->createPositionNPE->TransportGuid = fields[12].GetUInt64(); + + if (!sMapStore.LookupEntry(info->createPositionNPE->Loc.GetMapId())) + { + TC_LOG_ERROR("sql.sql", "Invalid NPE map id %u for class %u race %u pair in `playercreateinfo` table, ignoring.", + info->createPositionNPE->Loc.GetMapId(), current_class, current_race); + info->createPositionNPE.reset(); + } + + if (info->createPositionNPE && info->createPositionNPE->TransportGuid && !sTransportMgr->GetTransportSpawn(*info->createPositionNPE->TransportGuid)) + { + TC_LOG_ERROR("sql.sql", "Invalid NPE transport spawn id " UI64FMTD " for class %u race %u pair in `playercreateinfo` table, ignoring.", + *info->createPositionNPE->TransportGuid, current_class, current_race); + info->createPositionNPE.reset(); // remove entire NPE data - assume user put transport offsets into npe_position fields + } + } + _playerInfo[current_race][current_class] = std::move(info); ++count; |