From 1521a0d1312dff7599348f0d271b8605b034c127 Mon Sep 17 00:00:00 2001 From: Meji Date: Sat, 10 Sep 2022 12:46:52 +0200 Subject: Core/Gossip: Fixed loading ActionPoiID data after 69e0249807f5a8f351e6be6f7350ebace3d2997 (#28240) --- src/server/game/Globals/ObjectMgr.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src') 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) -- cgit v1.2.3