From 575bcc8c8225420c607e56c507ce837e50759e6a Mon Sep 17 00:00:00 2001
From: Sorikoff <46191832+Sorikoff@users.noreply.github.com>
Date: Sun, 21 Apr 2019 14:22:39 +0000
Subject: Scripts: Minor improvements to recently migrated scripts (#23189)

Ref: 2cfaeb14004cfbb5500855472ad89ab9238df13d
(cherry picked from commit 90d4254a875de7ea4e6aaed7a39effb6b2a73abf)
---
 src/server/scripts/Spells/spell_item.cpp | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp
index db9a822dab8..428dd4f7280 100644
--- a/src/server/scripts/Spells/spell_item.cpp
+++ b/src/server/scripts/Spells/spell_item.cpp
@@ -3660,9 +3660,9 @@ class spell_item_taunt_flag_targeting : public SpellScript
 
 enum MirrensDrinkingHat
 {
-    ITEM_LOCH_MODAN_LAGER       = 23584,
-    ITEM_STOUTHAMMER_LITE       = 23585,
-    ITEM_AERIE_PEAK_PALE_ALE    = 23586
+    SPELL_LOCH_MODAN_LAGER      = 29827,
+    SPELL_STOUTHAMMER_LITE      = 29828,
+    SPELL_AERIE_PEAK_PALE_ALE   = 29829
 };
 
 // 29830 - Mirren's Drinking Hat
@@ -3672,21 +3672,25 @@ class spell_item_mirrens_drinking_hat : public SpellScript
 
     void HandleScriptEffect(SpellEffIndex /*effIndex*/)
     {
-        uint32 itemId;
+        uint32 spellId;
         switch (urand(1, 6))
         {
             case 1:
             case 2:
             case 3:
-                itemId = ITEM_LOCH_MODAN_LAGER; break;
+                spellId = SPELL_LOCH_MODAN_LAGER; break;
             case 4:
             case 5:
-                itemId = ITEM_STOUTHAMMER_LITE; break;
+                spellId = SPELL_STOUTHAMMER_LITE; break;
             case 6:
-                itemId = ITEM_AERIE_PEAK_PALE_ALE; break;
+                spellId = SPELL_AERIE_PEAK_PALE_ALE; break;
+            default:
+                return;
         }
-        if (itemId)
-            CreateItem(itemId, ItemContext::NONE);
+
+        Unit* caster = GetCaster();
+        caster->CastSpell(caster, spellId, CastSpellExtraArgs(TRIGGERED_FULL_MASK)
+            .SetOriginalCastId(GetSpell()->m_castId));
     }
 
     void Register() override
-- 
cgit v1.2.3