diff options
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index f715dd6d6ac..075875e7fe5 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -7125,7 +7125,7 @@ Trinity::IteratorPair<std::unordered_map<uint32, WorldSafeLocsEntry>::const_iter return std::make_pair(_worldSafeLocs.begin(), _worldSafeLocs.end()); } -AreaTriggerStruct const* ObjectMgr::GetAreaTrigger(uint32 trigger) const +AreaTriggerTeleport const* ObjectMgr::GetAreaTrigger(uint32 trigger) const { AreaTriggerContainer::const_iterator itr = _areaTriggerStore.find(trigger); if (itr != _areaTriggerStore.end()) @@ -7215,6 +7215,13 @@ void ObjectMgr::LoadAreaTriggerTeleports() uint32 Trigger_ID = fields[0].GetUInt32(); uint32 PortLocID = fields[1].GetUInt32(); + AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(Trigger_ID); + if (!atEntry) + { + TC_LOG_ERROR("sql.sql", "Area Trigger (ID: {}) does not exist in AreaTrigger.dbc.", Trigger_ID); + continue; + } + WorldSafeLocsEntry const* portLoc = GetWorldSafeLoc(PortLocID); if (!portLoc) { @@ -7222,7 +7229,7 @@ void ObjectMgr::LoadAreaTriggerTeleports() continue; } - AreaTriggerStruct at; + AreaTriggerTeleport& at = _areaTriggerStore[Trigger_ID]; at.target_mapId = portLoc->Loc.GetMapId(); at.target_X = portLoc->Loc.GetPositionX(); @@ -7230,15 +7237,6 @@ void ObjectMgr::LoadAreaTriggerTeleports() at.target_Z = portLoc->Loc.GetPositionZ(); at.target_Orientation = portLoc->Loc.GetOrientation(); - AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(Trigger_ID); - if (!atEntry) - { - TC_LOG_ERROR("sql.sql", "Area Trigger (ID: {}) does not exist in AreaTrigger.dbc.", Trigger_ID); - continue; - } - - _areaTriggerStore[Trigger_ID] = at; - } while (result->NextRow()); TC_LOG_INFO("server.loading", ">> Loaded {} area trigger teleport definitions in {} ms", count, GetMSTimeDiffToNow(oldMSTime)); @@ -7371,7 +7369,7 @@ void ObjectMgr::LoadAccessRequirements() /* * Searches for the areatrigger which teleports players out of the given map with instance_template.parent field support */ -AreaTriggerStruct const* ObjectMgr::GetGoBackTrigger(uint32 Map) const +AreaTriggerTeleport const* ObjectMgr::GetGoBackTrigger(uint32 Map) const { Optional<uint32> parentId; MapEntry const* mapEntry = sMapStore.LookupEntry(Map); @@ -7398,7 +7396,7 @@ AreaTriggerStruct const* ObjectMgr::GetGoBackTrigger(uint32 Map) const /** * Searches for the areatrigger which teleports players to the given map */ -AreaTriggerStruct const* ObjectMgr::GetMapEntranceTrigger(uint32 Map) const +AreaTriggerTeleport const* ObjectMgr::GetMapEntranceTrigger(uint32 Map) const { for (AreaTriggerContainer::const_iterator itr = _areaTriggerStore.begin(); itr != _areaTriggerStore.end(); ++itr) { |