aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorkaelima <jeppo_meyer@msn.com>2011-06-02 15:38:42 +0200
committerkaelima <jeppo_meyer@msn.com>2011-06-02 15:38:42 +0200
commit3e20e4ebe657430a00436725c5a7104be50d0ce8 (patch)
tree7e77666442d4e20dca68eca62d568be496e7f8ab /src
parent843d4288f8b8e75f6e004d6873d225cac826ef89 (diff)
Scripts/Azuremyst Isle: Actually fixed what was stated in last commit :P
Diffstat (limited to 'src')
-rw-r--r--src/server/scripts/Kalimdor/azuremyst_isle.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp
index fef78351924..18d59538d32 100644
--- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp
@@ -655,6 +655,7 @@ public:
/*########
## Quest: The Prophecy of Akida
########*/
+
enum BristlelimbCage
{
QUEST_THE_PROPHECY_OF_AKIDA = 9544,
@@ -678,12 +679,15 @@ class npc_stillpine_capitive : public CreatureScript
{
npc_stillpine_capitiveAI(Creature* creature) : ScriptedAI(creature)
{
- if (GameObject* cage = me->FindNearestGameObject(GO_BRISTELIMB_CAGE, 5.0f))
- cage->UseDoorOrButton(); // This may seem strange but is actually closing door.
}
void Reset()
{
+ if (GameObject* cage = me->FindNearestGameObject(GO_BRISTELIMB_CAGE, 5.0f))
+ {
+ cage->SetLootState(GO_JUST_DEACTIVATED);
+ cage->SetGoState(GO_STATE_READY);
+ }
_events.Reset();
_player = NULL;
_movementComplete = false;
@@ -697,7 +701,7 @@ class npc_stillpine_capitive : public CreatureScript
_player = owner;
}
Position pos;
- me->GetNearPosition(pos, 3.5f, 0.0f);
+ me->GetNearPosition(pos, 3.0f, 0.0f);
me->GetMotionMaster()->MovePoint(POINT_INIT, pos);
}
@@ -709,9 +713,6 @@ class npc_stillpine_capitive : public CreatureScript
if (_player)
_player->KilledMonsterCredit(me->GetEntry(), me->GetGUID());
- if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE)
- me->GetMotionMaster()->MovementExpired();
-
_movementComplete = true;
_events.ScheduleEvent(EVENT_DESPAWN, 3500);
}