aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/server/game/DungeonFinding/LFGMgr.cpp2
-rw-r--r--src/server/game/Entities/Player/Player.cpp2
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp24
-rw-r--r--src/server/game/Globals/ObjectMgr.h10
-rw-r--r--src/server/game/Handlers/CharacterHandler.cpp2
-rw-r--r--src/server/game/Handlers/MiscHandler.cpp2
-rw-r--r--src/server/scripts/Commands/cs_go.cpp4
7 files changed, 22 insertions, 24 deletions
diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp
index 86d0b5f5148..2733f2c8df7 100644
--- a/src/server/game/DungeonFinding/LFGMgr.cpp
+++ b/src/server/game/DungeonFinding/LFGMgr.cpp
@@ -256,7 +256,7 @@ void LFGMgr::LoadLFGDungeons(bool reload /* = false */)
// No teleport coords in database, load from areatriggers
if (dungeon.type != LFG_TYPE_RANDOM && dungeon.x == 0.0f && dungeon.y == 0.0f && dungeon.z == 0.0f)
{
- AreaTriggerStruct const* at = sObjectMgr->GetMapEntranceTrigger(dungeon.map);
+ AreaTriggerTeleport const* at = sObjectMgr->GetMapEntranceTrigger(dungeon.map);
if (!at)
{
TC_LOG_ERROR("sql.sql", "Failed to load dungeon {} (Id: {}), cant find areatrigger for map {}", dungeon.name, dungeon.id, dungeon.map);
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 370d7af312f..89bf5831d36 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -18186,7 +18186,7 @@ bool Player::LoadFromDB(ObjectGuid guid, CharacterDatabaseQueryHolder const& hol
// load the player's map here if it's not already loaded
if (!map)
map = sMapMgr->CreateMap(mapId, this);
- AreaTriggerStruct const* areaTrigger = nullptr;
+ AreaTriggerTeleport const* areaTrigger = nullptr;
bool check = false;
if (!map)
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)
{
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index 16cb17696cc..15a59853a1d 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -449,7 +449,7 @@ struct TC_GAME_API SpellClickInfo
typedef std::multimap<uint32, SpellClickInfo> SpellClickInfoContainer;
-struct AreaTriggerStruct
+struct AreaTriggerTeleport
{
uint32 target_mapId;
float target_X;
@@ -986,7 +986,7 @@ class TC_GAME_API ObjectMgr
typedef std::unordered_map<uint32, Trinity::unique_trackable_ptr<Quest>> QuestContainer;
typedef std::unordered_map<uint32 /*questObjectiveId*/, QuestObjective const*> QuestObjectivesByIdContainer;
- typedef std::unordered_map<uint32, AreaTriggerStruct> AreaTriggerContainer;
+ typedef std::unordered_map<uint32, AreaTriggerTeleport> AreaTriggerContainer;
typedef std::unordered_map<uint32, uint32> AreaTriggerScriptContainer;
@@ -1140,10 +1140,10 @@ class TC_GAME_API ObjectMgr
WorldSafeLocsEntry const* GetWorldSafeLoc(uint32 id) const;
Trinity::IteratorPair<std::unordered_map<uint32, WorldSafeLocsEntry>::const_iterator> GetWorldSafeLocs() const;
- AreaTriggerStruct const* GetAreaTrigger(uint32 trigger) const;
+ AreaTriggerTeleport const* GetAreaTrigger(uint32 trigger) const;
AccessRequirement const* GetAccessRequirement(uint32 mapid, Difficulty difficulty) const;
- AreaTriggerStruct const* GetGoBackTrigger(uint32 Map) const;
- AreaTriggerStruct const* GetMapEntranceTrigger(uint32 Map) const;
+ AreaTriggerTeleport const* GetGoBackTrigger(uint32 Map) const;
+ AreaTriggerTeleport const* GetMapEntranceTrigger(uint32 Map) const;
uint32 GetAreaTriggerScriptId(uint32 trigger_id) const;
uint32 GetEventScriptId(uint32 eventId) const;
diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp
index 1628f0c4dd1..7f6ca72c7ef 100644
--- a/src/server/game/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Handlers/CharacterHandler.cpp
@@ -1272,7 +1272,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder const& holder)
if (!pCurrChar->GetMap()->AddPlayerToMap(pCurrChar))
{
- AreaTriggerStruct const* at = sObjectMgr->GetGoBackTrigger(pCurrChar->GetMapId());
+ AreaTriggerTeleport const* at = sObjectMgr->GetGoBackTrigger(pCurrChar->GetMapId());
if (at)
pCurrChar->TeleportTo(at->target_mapId, at->target_X, at->target_Y, at->target_Z, pCurrChar->GetOrientation());
else
diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp
index 5a08d176f30..fab4f104900 100644
--- a/src/server/game/Handlers/MiscHandler.cpp
+++ b/src/server/game/Handlers/MiscHandler.cpp
@@ -594,7 +594,7 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPackets::AreaTrigger::AreaTrigge
if (!packet.Entered)
return;
- AreaTriggerStruct const* at = sObjectMgr->GetAreaTrigger(packet.AreaTriggerID);
+ AreaTriggerTeleport const* at = sObjectMgr->GetAreaTrigger(packet.AreaTriggerID);
if (!at)
return;
diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp
index 85bbcbabe72..84c23972916 100644
--- a/src/server/scripts/Commands/cs_go.cpp
+++ b/src/server/scripts/Commands/cs_go.cpp
@@ -481,7 +481,7 @@ public:
player->SaveRecallPosition();
// try going to entrance
- if (AreaTriggerStruct const* exit = sObjectMgr->GetGoBackTrigger(mapId))
+ if (AreaTriggerTeleport const* exit = sObjectMgr->GetGoBackTrigger(mapId))
{
if (player->TeleportTo(exit->target_mapId, exit->target_X, exit->target_Y, exit->target_Z, exit->target_Orientation + M_PI))
{
@@ -499,7 +499,7 @@ public:
handler->PSendSysMessage(LANG_COMMAND_INSTANCE_NO_EXIT, mapName, mapId);
// try going to start
- if (AreaTriggerStruct const* entrance = sObjectMgr->GetMapEntranceTrigger(mapId))
+ if (AreaTriggerTeleport const* entrance = sObjectMgr->GetMapEntranceTrigger(mapId))
{
if (player->TeleportTo(entrance->target_mapId, entrance->target_X, entrance->target_Y, entrance->target_Z, entrance->target_Orientation))
{