Merge branch 'master' into 4.3.4

Conflicts: src/server/scripts/Kalimdor/zone_durotar.cpp
2013-02-05 09:57:14 +01:00
parent c4d3b83191 fedc26a115
commit f7c7f0f0f6
39 changed files with 248 additions and 149 deletions
@@ -104,7 +104,7 @@ void ScriptedAI::AttackStartNoMove(Unit* who)
    if (!who)
        return;

-    if (me->Attack(who, false))
+    if (me->Attack(who, true))
        DoStartNoMovement(who);
 }

@@ -447,15 +447,6 @@ bool ScriptedAI::EnterEvadeIfOutOfCombatArea(uint32 const diff)
    return true;
 }

-void Scripted_NoMovementAI::AttackStart(Unit* target)
-{
-    if (!target)
-        return;
-
-    if (me->Attack(target, true))
-        DoStartNoMovement(target);
-}
-
 // BossAI - for instanced bosses
 BossAI::BossAI(Creature* creature, uint32 bossId) : ScriptedAI(creature),
    instance(creature->GetInstanceScript()),