From 88a356d2cd69a4c4dd206ba165d9907bc9c2fc64 Mon Sep 17 00:00:00 2001 From: Alvin Zhu Date: Sat, 7 Jan 2023 14:54:17 +0800 Subject: [PATCH] fix issue #10913 fix GetQuestGreetingLocale typeIndex just like GetQuestGreeting --- src/server/game/Globals/ObjectMgr.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 72e8488a02..9163e32b23 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -1263,7 +1263,15 @@ public: } [[nodiscard]] QuestGreetingLocale const* GetQuestGreetingLocale(TypeID type, uint32 id) const { - QuestGreetingLocaleContainer::const_iterator itr = _questGreetingLocaleStore.find(MAKE_PAIR32(type, id)); + uint32 typeIndex; + if (type == TYPEID_UNIT) + typeIndex = 0; + else if (type == TYPEID_GAMEOBJECT) + typeIndex = 1; + else + return nullptr; + + QuestGreetingLocaleContainer::const_iterator itr = _questGreetingLocaleStore.find(MAKE_PAIR32(typeIndex, id)); if (itr == _questGreetingLocaleStore.end()) return nullptr; return &itr->second; }