From 90d4254a875de7ea4e6aaed7a39effb6b2a73abf 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
---
 src/server/scripts/Spells/spell_dk.cpp   |  3 ++-
 src/server/scripts/Spells/spell_item.cpp | 21 +++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp
index 118d8a0f327..d1f3527442c 100644
--- a/src/server/scripts/Spells/spell_dk.cpp
+++ b/src/server/scripts/Spells/spell_dk.cpp
@@ -103,6 +103,7 @@ enum DeathKnightSpells
 
 enum DeathKnightSpellIcons
 {
+    DK_ICON_ID_EPIDEMIC                         = 234,
     DK_ICON_ID_IMPROVED_DEATH_STRIKE            = 2751
 };
 
@@ -1295,7 +1296,7 @@ class spell_dk_glyph_of_scourge_strike_script : public SpellScript
                 // this Glyph
                 countMax += 9000;
                 // talent Epidemic
-                if (AuraEffect const* epidemic = caster->GetAuraEffect(SPELL_AURA_ADD_FLAT_MODIFIER, SPELLFAMILY_DEATHKNIGHT, 234, EFFECT_0))
+                if (AuraEffect const* epidemic = caster->GetAuraEffect(SPELL_AURA_ADD_FLAT_MODIFIER, SPELLFAMILY_DEATHKNIGHT, DK_ICON_ID_EPIDEMIC, EFFECT_0))
                     countMax += epidemic->GetAmount();
 
                 if (countMin < countMax)
diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp
index 69b81267db1..4709db47f59 100644
--- a/src/server/scripts/Spells/spell_item.cpp
+++ b/src/server/scripts/Spells/spell_item.cpp
@@ -3717,9 +3717,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
@@ -3727,23 +3727,24 @@ class spell_item_mirrens_drinking_hat : public SpellScript
 {
     PrepareSpellScript(spell_item_mirrens_drinking_hat);
 
-    void HandleScriptEffect(SpellEffIndex effIndex)
+    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;
         }
-        if (itemId)
-            CreateItem(effIndex, itemId);
+
+        Unit* caster = GetCaster();
+        caster->CastSpell(caster, spellId);
     }
 
     void Register() override
-- 
cgit v1.2.3