diff options
| author | Meji <alvaro.megias@outlook.com> | 2022-09-10 12:46:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-10 12:46:52 +0200 |
| commit | 1521a0d1312dff7599348f0d271b8605b034c127 (patch) | |
| tree | bc7a4eae5825419b862fc7ec44287b5372b7bc10 | |
| parent | 01873bcb662fbcee65ce0e38df0dde91044ed0ba (diff) | |
Core/Gossip: Fixed loading ActionPoiID data after 69e0249807f5a8f351e6be6f7350ebace3d2997 (#28240)
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index b16e32d40a7..91e6d48130e 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -9671,11 +9671,15 @@ void ObjectMgr::LoadGossipMenuItems() if (gMenuItem.ActionPoiID) { if (gMenuItem.OptionNpc != GossipOptionNpc::None) + { TC_LOG_ERROR("sql.sql", "Table `gossip_menu_option` for menu %u, id %u can not use ActionPoiID for GossipOptionNpc different from GossipOptionNpc::None, ignoring", gMenuItem.MenuID, gMenuItem.OptionID); + gMenuItem.ActionPoiID = 0; + } else if (!GetPointOfInterest(gMenuItem.ActionPoiID)) + { TC_LOG_ERROR("sql.sql", "Table `gossip_menu_option` for menu %u, id %u use non-existing ActionPoiID %u, ignoring", gMenuItem.MenuID, gMenuItem.OptionID, gMenuItem.ActionPoiID); - - gMenuItem.ActionPoiID = 0; + gMenuItem.ActionPoiID = 0; + } } if (gMenuItem.BoxBroadcastTextID) |