1 files changed, 5 insertions, 8 deletions
diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
index aa8e6ca9cec..01831f81d50 100644
--- a/src/game/GameObject.cpp
+++ b/src/game/GameObject.cpp
@@ -1173,6 +1173,7 @@ void GameObject::Use(Unit* user)
 
             // cast this spell later if provided
             spellId = info->goober.spellId;
+            spellCaster = NULL;
 
             break;
         }
@@ -1482,14 +1483,10 @@ void GameObject::Use(Unit* user)
         return;
     }
 
-    Spell *spell = new Spell(spellCaster, spellInfo, triggered);
-    //Spell *spell = new Spell(spellCaster, spellInfo, triggered,GetGUID());
-
-    // spell target is user of GO
-    SpellCastTargets targets;
-    targets.setUnitTarget(user);
-
-    spell->prepare(&targets);
+    if (spellCaster)
+        spellCaster->CastSpell(user, spellInfo, triggered);
+    else
+        CastSpell(user, spellId);
 }
 
 void GameObject::CastSpell(Unit* target, uint32 spellId)