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

Conflicts: src/server/game/Movement/Spline/MoveSplineInit.cpp
2013-06-01 18:34:58 +02:00
parent 7d64b56db1 fb718d20aa
commit 1866c7a038
14 changed files with 102 additions and 31 deletions
@@ -15848,12 +15848,9 @@ bool Unit::HandleSpellClick(Unit* clicker, int8 seatId)
        result = true;
    }

-    if (result)
-    {
-        Creature* creature = ToCreature();
-        if (creature && creature->IsAIEnabled)
-            creature->AI()->OnSpellClick(clicker);
-    }
+    Creature* creature = ToCreature();
+    if (creature && creature->IsAIEnabled)
+        creature->AI()->OnSpellClick(clicker, result);

    return result;
 }