From 606c443cb02697fba71bba5baf3ada57f574e28f Mon Sep 17 00:00:00 2001 From: DDuarte Date: Fri, 3 Apr 2015 20:59:15 +0100 Subject: Revert "Merge pull request #14424 from Rushor/Rampart" This reverts commit 22c0007b42e80fecd81eee53f856fd10decd5c05, reversing changes made to 20bc2c51f668db245d6e360486ea8743c1887fac. --- .../HellfireRamparts/boss_vazruden_the_herald.cpp | 34 +++------------------- 1 file changed, 4 insertions(+), 30 deletions(-) (limited to 'src') diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index 9da979d1105..a6c00c05dce 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -426,37 +426,11 @@ class boss_vazruden_the_herald : public CreatureScript if ((Nazan && Nazan->IsAlive()) || (Vazruden && Vazruden->IsAlive())) { if ((Nazan && Nazan->GetVictim()) || (Vazruden && Vazruden->GetVictim())) - { - if (Nazan->IsInCombat()) - return; - else - { - const Position Nazan_FlyAggro = { -1380.425f, 1721.026f, 90.40f, 2.426f }; - if (Nazan) - Nazan->GetMotionMaster()->MoveTakeoff(0, Nazan_FlyAggro); - } - } + return; else - { //reset, if by chance the party wipes (1st boss) - if (Vazruden && Vazruden->IsAlive()) - { - if (phase != 1) - phase = 1; - } - else - { - if (phase != 2) //reset just Nazan, Vazruden is dead - phase = 2; - } - - me->GetMotionMaster()->Clear(); // reset and move back into pos... - me->GetMotionMaster()->MovePoint(0, VazrudenMiddle[0], VazrudenMiddle[1], VazrudenMiddle[2]); - - if (phase > 2) - { - EnterEvadeMode(); - Reset(); - } + { + UnsummonAdds(); + EnterEvadeMode(); return; } } -- cgit v1.2.3