sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(Core/DB/Creature): Throw error if npcflag and gossip_menu_id is not c… (#9665)

Browse Source 
* feat(DB/Creature): Throw error if npcflag and gossip_menu_id is not combined

*cherry-pick commit (https://github.com/TrinityCore/TrinityCore/commit/a513922fc1572137c4e8b7b75d7ba931b15cf26a)

* test

* Update ObjectMgr.cpp

* codestyle

* Update src/server/game/Globals/ObjectMgr.cpp

Co-authored-by: Francesco Borzì <borzifrancesco@gmail.com>

* Update src/server/game/Globals/ObjectMgr.cpp

Co-authored-by: Francesco Borzì <borzifrancesco@gmail.com>
This commit is contained in:
Kitzunu
2022-01-20 10:50:18 +01:00
committed by GitHub
parent 144c797dba
commit dd15fa706d
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Globals/ObjectMgr.cpp
+15
View File
@@ -1160,6 +1160,21 @@ void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo)
}
const_cast<CreatureTemplate*>(cInfo)->DamageModifier *= Creature::_GetDamageMod(cInfo->rank);
// Hack for modules
switch (cInfo->Entry)
{
case 190010: // Transmog Module
return;
}
if (cInfo->GossipMenuId && !(cInfo->npcflag & UNIT_NPC_FLAG_GOSSIP))
{
LOG_ERROR("sql.sql", "Creature (Entry: %u) has assigned gossip menu %u, but npcflag does not include UNIT_NPC_FLAG_GOSSIP (1).", cInfo->Entry, cInfo->GossipMenuId);
}
else if (!cInfo->GossipMenuId && (cInfo->npcflag & UNIT_NPC_FLAG_GOSSIP))
{
LOG_ERROR("sql.sql", "Creature (Entry: %u) has npcflag UNIT_NPC_FLAG_GOSSIP (1), but gossip menu is unassigned.", cInfo->Entry);
}
}
void ObjectMgr::CheckCreatureMovement(char const* table, uint64 id, CreatureMovementData& creatureMovement)