aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormegamage <none@none>2009-08-17 23:20:50 -0500
committermegamage <none@none>2009-08-17 23:20:50 -0500
commit98f58a0f0a6a5cfa8c7453b8124891a8b3fd4cbe (patch)
treea88b449a5758e816c4b752e291ddd8e9540e02d5 /src
parentdd3677b451eecc856ac71a34655a5f393cc818d6 (diff)
*Fix quest "endless hunger" in some machines. Thanks to McLovin.
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
index c8812863732..55aaf3d0cc8 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
@@ -224,28 +224,32 @@ void npc_unworthy_initiateAI::UpdateAI(const uint32 diff)
case PHASE_TO_EQUIP:
if (wait_timer)
{
- if (wait_timer < diff)
+ if (wait_timer > diff)
+ wait_timer -= diff;
+ else
{
me->GetMotionMaster()->MovePoint(1, anchorX, anchorY, me->GetPositionZ());
- debug_log("npc_unworthy_initiateAI: move to %f %f %f", anchorX, anchorY, me->GetPositionZ());
+ //debug_log("npc_unworthy_initiateAI: move to %f %f %f", anchorX, anchorY, me->GetPositionZ());
phase = PHASE_EQUIPING;
wait_timer = 0;
- }else wait_timer -= diff;
+ }
}
return;
case PHASE_TO_ATTACK:
if (wait_timer)
{
- if (wait_timer < diff)
+ if (wait_timer > diff)
+ wait_timer -= diff;
+ else
{
me->setFaction(14);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2);
phase = PHASE_ATTACKING;
- if (Unit* target = Unit::GetUnit((*me),playerGUID))
+ if (Player* target = Unit::GetPlayer(playerGUID))
me->AI()->AttackStart(target);
wait_timer = 0;
- }else wait_timer -= diff;
+ }
}
return;
case PHASE_ATTACKING:
@@ -282,7 +286,6 @@ void npc_unworthy_initiateAI::UpdateAI(const uint32 diff)
}
DoMeleeAttackIfReady();
- return;
}
}