From 8696e7be7f366fcc5885bdf57d5e60d46f8b5c18 Mon Sep 17 00:00:00 2001
From: avarishd <46330494+avarishd@users.noreply.github.com>
Date: Sat, 22 Apr 2023 16:08:25 +0300
Subject: [PATCH] fix(DB/Creature): Tamed Kodo - Remove gosisp flag. (#15165)

* fix(DB/Creature): Tamed Kodo - Remove gosisp flag.

* fix worldserver warning (assigned gossip, but no flag)

also typo

* Use &~
---
 data/sql/updates/pending_db_world/rev_1677147108487825000.sql | 2 ++
 src/server/scripts/Kalimdor/zone_desolace.cpp                 | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 data/sql/updates/pending_db_world/rev_1677147108487825000.sql

diff --git a/data/sql/updates/pending_db_world/rev_1677147108487825000.sql b/data/sql/updates/pending_db_world/rev_1677147108487825000.sql
new file mode 100644
index 000000000..761a44ba3
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1677147108487825000.sql
@@ -0,0 +1,2 @@
+-- Tamed Kodo - Remove gossip flag & gosip menu.
+UPDATE `creature_template` SET `npcflag` = `npcflag`&~(1),`gossip_menu_id` = 0  WHERE `entry` = 11627;
diff --git a/src/server/scripts/Kalimdor/zone_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp
index d49644c51..b4b242018 100644
--- a/src/server/scripts/Kalimdor/zone_desolace.cpp
+++ b/src/server/scripts/Kalimdor/zone_desolace.cpp
@@ -427,6 +427,8 @@ enum DyingKodo
 
     QUEST_KODO                      = 5561,
 
+    NPC_TEXT_KODO                   = 4449, // MenuID 3650
+
     NPC_SMEED                       = 11596,
     NPC_AGED_KODO                   = 4700,
     NPC_DYING_KODO                  = 4701,
@@ -498,7 +500,7 @@ public:
             player->RemoveAurasDueToSpell(SPELL_KODO_KOMBO_PLAYER_BUFF);
         }
 
-        SendGossipMenuFor(player, player->GetGossipTextId(creature), creature->GetGUID());
+        SendGossipMenuFor(player, NPC_TEXT_KODO, creature->GetGUID());
         return true;
     }