From 04560f0437039556343c80e04c29e09bc570aea7 Mon Sep 17 00:00:00 2001 From: Muhaha Date: Fri, 20 Feb 2009 14:14:16 +0100 Subject: * Merged ScriptDev2 897 * TODO: - fix mob_eventai.cpp line 613 DisplayID_A - merge boss_kaelthas.cpp with sd2 - fix azuremyst.cpp line 108 Spell->SpellFamilyFlags2 --HG-- branch : trunk --- src/bindings/scripts/include/sc_creature.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/bindings/scripts/include') diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp index a49f415c525..db5beb64ec8 100644 --- a/src/bindings/scripts/include/sc_creature.cpp +++ b/src/bindings/scripts/include/sc_creature.cpp @@ -108,9 +108,9 @@ void ScriptedAI::AttackStart(Unit* who) void ScriptedAI::UpdateAI(const uint32 diff) { //Check if we have a current target - if (m_creature->isAlive() && UpdateVictim()) + if (UpdateVictim()) { - if (m_creature->isAttackReady() ) + if (m_creature->isAttackReady()) { //If we are within range melee the target if (m_creature->IsWithinMeleeRange(m_creature->getVictim())) @@ -169,11 +169,10 @@ void ScriptedAI::DoStartNoMovement(Unit* victim) m_creature->StopMoving(); } - void ScriptedAI::DoMeleeAttackIfReady() { - //Make sure our attack is ready and we aren't currently casting before checking distance - if (m_creature->isAttackReady() && !m_creature->hasUnitState(UNIT_STAT_CASTING)) + //Make sure our attack is ready before checking distance + if (m_creature->isAttackReady()) { //If we are within range melee the target if (m_creature->IsWithinMeleeRange(m_creature->getVictim())) -- cgit v1.2.3