aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2016-08-28 23:24:04 -0300
committerGitHub <noreply@github.com>2016-08-28 23:24:04 -0300
commit7028503e8f80dc5488ea9dbf33f595ef2044001d (patch)
tree3578ce21a48959f6eebdb33c4946bee7679803a1 /src
parent33102220e53731ca958b46e87abacdce07e3aa88 (diff)
Core/ObjectMgr: filter out bogus check
This restores previous behaviour
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 8b0cbfa329d..ff0e9415236 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -6947,7 +6947,7 @@ void ObjectMgr::LoadGameObjectTemplateAddons()
gameObjectAddon.maxgold = fields[4].GetUInt32();
// checks
- if (!sFactionTemplateStore.LookupEntry(gameObjectAddon.faction))
+ if (gameObjectAddon.Faction && !sFactionTemplateStore.LookupEntry(gameObjectAddon.faction))
TC_LOG_ERROR("sql.sql", "GameObject (Entry: %u) has invalid faction (%u) defined in `gameobject_template_addon`.", entry, gameObjectAddon.faction);
if (gameObjectAddon.maxgold > 0)