aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Globals/ObjectMgr.cpp
diff options
context:
space:
mode:
authorOvah <dreadkiller@gmx.de>2020-11-17 23:41:15 +0100
committerShauren <shauren.trinity@gmail.com>2022-03-01 21:46:43 +0100
commit203dfec2a1d1d628469ed0d68fefac33c15e65d6 (patch)
tree996b037dd02b2e279ed0fad370493783258150df /src/server/game/Globals/ObjectMgr.cpp
parent191fea6055a323ad0a044f6ad47a2af697682ed3 (diff)
Core/Maps: add new FLAG_ALLIANCE_ONLY and FLAG_HORDE_ONLY for instance spawn groups (PR #25656)
(cherry picked from commit 4abbeb2a60370157bc9a72e5c566c1112ff904e9)
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index ad8dd328747..8f3bf2ebea2 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -2886,6 +2886,12 @@ void ObjectMgr::LoadInstanceSpawnGroups()
else
info.Flags = flags;
+ if ((flags & InstanceSpawnGroupInfo::FLAG_ALLIANCE_ONLY) && (flags & InstanceSpawnGroupInfo::FLAG_HORDE_ONLY))
+ {
+ info.Flags = flags & ~(InstanceSpawnGroupInfo::FLAG_ALLIANCE_ONLY | InstanceSpawnGroupInfo::FLAG_HORDE_ONLY);
+ TC_LOG_ERROR("sql.sql", "Instance spawn group (%u,%u) FLAG_ALLIANCE_ONLY and FLAG_HORDE_ONLY may not be used together in a single entry - truncated to %u.", instanceMapId, spawnGroupId, info.Flags);
+ }
+
++n;
} while (result->NextRow());