Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4

1 files changed, 21 insertions, 5 deletions

diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp
index a6d6cda11b1..c0635f897d9 100644
--- a/src/server/scripts/Northrend/sholazar_basin.cpp
+++ b/src/server/scripts/Northrend/sholazar_basin.cpp
@@ -722,10 +722,17 @@ class npc_adventurous_dwarf : public CreatureScript
 public:
     npc_adventurous_dwarf() : CreatureScript("npc_adventurous_dwarf") { }
 
+    struct npc_adventurous_dwarfAI : public ScriptedAI
+    {
+        npc_adventurous_dwarfAI(Creature* creature) : ScriptedAI(creature)
+        {
+            Talk(SAY_DWARF_OUCH);
+        }
+    };
+
     CreatureAI* GetAI(Creature* creature) const
     {
-        creature->AI()->Talk(SAY_DWARF_OUCH);
-        return NULL;
+        return new npc_adventurous_dwarfAI(creature);
     }
 
     bool OnGossipHello(Player* player, Creature* creature)
@@ -750,14 +757,23 @@ public:
     {
         player->PlayerTalkClass->ClearMenus();
         uint32 spellId = 0;
+
         switch (action)
         {
-            case GOSSIP_ACTION_INFO_DEF + 1: spellId = SPELL_ADD_ORANGE;     break;
-            case GOSSIP_ACTION_INFO_DEF + 2: spellId = SPELL_ADD_BANANAS;    break;
-            case GOSSIP_ACTION_INFO_DEF + 3: spellId = SPELL_ADD_PAPAYA;     break;
+            case GOSSIP_ACTION_INFO_DEF + 1:
+                spellId = SPELL_ADD_ORANGE;
+                break;
+            case GOSSIP_ACTION_INFO_DEF + 2:
+                spellId = SPELL_ADD_BANANAS;
+                break;
+            case GOSSIP_ACTION_INFO_DEF + 3:
+                spellId = SPELL_ADD_PAPAYA;
+                break;
         }
+
         if (spellId)
             player->CastSpell(player, spellId, true);
+
         creature->AI()->Talk(SAY_DWARF_HELP);
         creature->DespawnOrUnsummon();
         return true;