From 5e345742e693e83d90ec63518efc85e7f02ac16c Mon Sep 17 00:00:00 2001
From: Stoabrogga <38475780+Stoabrogga@users.noreply.github.com>
Date: Sun, 4 Aug 2019 23:44:36 +0200
Subject: [PATCH] fix(DB/Core): Throwing spells for Instructor Razuvious and
 Drakkari Battle Riders (#2109)

---
 .../pending_db_world/rev_1563489887082454533.sql       |  7 +++++++
 src/server/game/Spells/SpellMgr.cpp                    | 10 ++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1563489887082454533.sql

diff --git a/data/sql/updates/pending_db_world/rev_1563489887082454533.sql b/data/sql/updates/pending_db_world/rev_1563489887082454533.sql
new file mode 100644
index 000000000..2863f36e3
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1563489887082454533.sql
@@ -0,0 +1,7 @@
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1563489887082454533');
+
+-- Equip a throwing knife for Instructor Razuvious to use with his ability "Jagged Knife"
+UPDATE `creature_equip_template` SET `ItemID3` = 29010 WHERE `CreatureID` = 16061;
+
+-- Ensure that the Drakkari Battle Riders can use their ability "Poisoned Spear" (otherwise they would constantly use "Throw")
+UPDATE `smart_scripts` SET `action_param2` = 1 WHERE `entryorguid` = 29836 AND `source_type` = 0 AND `id` IN (2,3);
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 31ef8a451..74ae2f778 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -4548,6 +4548,10 @@ void SpellMgr::LoadDbcDataCorrections()
         case 29125:
             spellInfo->EffectImplicitTargetB[0] = TARGET_UNIT_SRC_AREA_ENTRY;
             break;
+        // Jagged Knife
+        case 55550:
+            spellInfo->Attributes |= SPELL_ATTR0_REQ_AMMO;
+            break;
 
         //////////////////////////////////////////
         ////////// Gundrak
@@ -4556,6 +4560,12 @@ void SpellMgr::LoadDbcDataCorrections()
         case 55098:
             spellInfo->InterruptFlags |= SPELL_INTERRUPT_FLAG_INTERRUPT;
             break;
+        case 55521: // Poisoned Spear (Normal)
+        case 58967: // Poisoned Spear (Heroic)
+        case 55348: // Throw (Normal)
+        case 58966: // Throw (Heroic)
+            spellInfo->Attributes |= SPELL_ATTR0_REQ_AMMO;
+            break;
 
         //////////////////////////////////////////
         ////////// The Nexus: Nexus