From 7679e9a30ae0f0bb76b3d5c1b6519473bf0c5cc2 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Thu, 2 Aug 2018 23:05:48 +0200 Subject: [PATCH] Scripts/BrC: fixed Raz' not continuing his path when entering evade mode --- .../BlackrockCaverns/blackrock_caverns.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp index 20275ddfb3f..b681a6c46ad 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp @@ -582,6 +582,10 @@ struct npc_raz_the_crazed : public EscortAI { EscortAI::EnterEvadeMode(why); DoCastSelf(SPELL_AGGRO_NEARBY_TARGETS, true); + if (_instance->GetData(DATA_RAZ_LAST_AREA_INDEX) == RAZ_AREA_INDEX_ROMOGG) + BuildRomoggPath(); + else if (_instance->GetData(DATA_RAZ_LAST_AREA_INDEX) == RAZ_AREA_INDEX_CORLA) + BuildCorlaPath(); } void JustAppeared() override @@ -590,6 +594,7 @@ struct npc_raz_the_crazed : public EscortAI { me->SetDisableGravity(true); me->SetHover(true); + BuildRomoggPath(); DoCastSelf(SPELL_HIGH_SECURITY_SHADOW_PRISON, true); } else if (_instance->GetData(DATA_RAZ_LAST_AREA_INDEX) == RAZ_AREA_INDEX_CORLA) @@ -607,7 +612,6 @@ struct npc_raz_the_crazed : public EscortAI { me->RemoveAurasDueToSpell(SPELL_HIGH_SECURITY_SHADOW_PRISON); DoCastSelf(SPELL_LEAP_FROM_CAGE); - BuildRomoggPath(); _events.ScheduleEvent(EVENT_DISABLE_GRAVITY_AND_HOVER, 2s + 500ms); _events.ScheduleEvent(EVENT_START_ESCORT_PATH, 4s); _events.ScheduleEvent(EVENT_SAY_SMASH, 4s); @@ -623,7 +627,7 @@ struct npc_raz_the_crazed : public EscortAI void BuildCorlaPath() { for (uint8 i = 0; i < 2; i++) - AddWaypoint(i, RazPathCorla[i].GetPositionX(), RazPathCorla[i].GetPositionY(), RazPathCorla[i].GetPositionZ()); + AddWaypoint(i, RazPathCorla[i].GetPositionX(), RazPathCorla[i].GetPositionY(), RazPathCorla[i].GetPositionZ()); } void WaypointReached(uint32 id, uint32 /*pathId*/) override @@ -673,6 +677,7 @@ struct npc_raz_the_crazed : public EscortAI Talk(SAY_SMASH); break; case EVENT_START_ESCORT_PATH: + me->SetHomePosition(me->GetPosition()); Start(false, false); break; case EVENT_FACE_TO_THE_SIDE: