diff options
| author | Kitzunu <24550914+Kitzunu@users.noreply.github.com> | 2022-04-23 16:22:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-23 16:22:17 +0200 |
| commit | c55c4aa015d452cb16dc86d54bb81bd98463bc08 (patch) | |
| tree | 5ec88fbff13693b95d20b1966d4e0f75ee625568 /src/server/game/Globals/ObjectMgr.cpp | |
| parent | 4bb56bd8f24f01adbf7b32c904a9e1eb25c4bf42 (diff) | |
feat(Core/Creature): CREATURE_FLAG_EXTRA_MODULE (#11445)
* feat(Core/Creature): CREATURE_FLAG_EXTRA_MODULE
* Update CreatureData.h
* Update CreatureData.h
* Update CreatureData.h
* Update enuminfo_CreatureData.cpp
* Update enuminfo_CreatureData.cpp
* Update enuminfo_CreatureData.cpp
Co-authored-by: Skjalf <47818697+Nyeriah@users.noreply.github.com>
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index c8fac0b318..161f1d638a 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -1189,11 +1189,11 @@ void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo) return; } - if (cInfo->GossipMenuId && !(cInfo->npcflag & UNIT_NPC_FLAG_GOSSIP)) + if ((cInfo->GossipMenuId && !(cInfo->npcflag & UNIT_NPC_FLAG_GOSSIP)) && !(cInfo->flags_extra & CREATURE_FLAG_EXTRA_MODULE)) { LOG_ERROR("sql.sql", "Creature (Entry: {}) has assigned gossip menu {}, but npcflag does not include UNIT_NPC_FLAG_GOSSIP (1).", cInfo->Entry, cInfo->GossipMenuId); } - else if (!cInfo->GossipMenuId && (cInfo->npcflag & UNIT_NPC_FLAG_GOSSIP)) + else if ((!cInfo->GossipMenuId && (cInfo->npcflag & UNIT_NPC_FLAG_GOSSIP)) && !(cInfo->flags_extra & CREATURE_FLAG_EXTRA_MODULE)) { LOG_ERROR("sql.sql", "Creature (Entry: {}) has npcflag UNIT_NPC_FLAG_GOSSIP (1), but gossip menu is unassigned.", cInfo->Entry); } |