aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskipperheartbeat <36843407+skipperheartbeat@users.noreply.github.com>2020-04-19 10:01:31 +0100
committerGitHub <noreply@github.com>2020-04-19 11:01:31 +0200
commit8ac83744293afe297bce2597107bc5da5445ccbb (patch)
tree0f89e3ca3ef9958199ecf8a13981b3b4cf3905ab
parenta2d2884342a741d0da1e0f314fa6b9f6b778d3bc (diff)
Boss/Script: Vazruden_Fix (#24197)
* Add files via upload * Update boss_vazruden_the_herald.cpp * Update boss_vazruden_the_herald.cpp * Update boss_vazruden_the_herald.cpp * Update boss_vazruden_the_herald.cpp * Update boss_vazruden_the_herald.cpp * Update boss_vazruden_the_herald.cpp * Update boss_vazruden_the_herald.cpp * Update boss_vazruden_the_herald.cpp * Update boss_vazruden_the_herald.cpp * Update src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp Co-Authored-By: Trond B. Krokli <38162891+illfated@users.noreply.github.com> * Update src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp Co-Authored-By: Trond B. Krokli <38162891+illfated@users.noreply.github.com> * Update src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp Co-Authored-By: Trond B. Krokli <38162891+illfated@users.noreply.github.com> * Update src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp Co-Authored-By: Trond B. Krokli <38162891+illfated@users.noreply.github.com> * Update src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp Co-Authored-By: Trond B. Krokli <38162891+illfated@users.noreply.github.com> * Update src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp Co-Authored-By: Trond B. Krokli <38162891+illfated@users.noreply.github.com> * Update src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp Co-Authored-By: Trond B. Krokli <38162891+illfated@users.noreply.github.com> * Update src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp Co-Authored-By: offl <suffle.o@gmail.com> * Update src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp Co-Authored-By: Trond B. Krokli <38162891+illfated@users.noreply.github.com> * Update boss_vazruden_the_herald.cpp * Update boss_vazruden_the_herald.cpp * Update boss_vazruden_the_herald.cpp Co-authored-by: Aokromes <Aokromes@users.noreply.github.com> Co-authored-by: Trond B. Krokli <38162891+illfated@users.noreply.github.com> Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com> Co-authored-by: offl <suffle.o@gmail.com>
Diffstat
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp9
1 files changed, 9 insertions, 0 deletions
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 8fbb9725ee2..22d0d29af0f 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
@@ -26,6 +26,7 @@ EndScriptData */
#include "hellfire_ramparts.h"
#include "MotionMaster.h"
#include "ObjectAccessor.h"
+#include "Player.h"
#include "ScriptedCreature.h"
#include "SpellInfo.h"
#include "TemporarySummon.h"
@@ -349,7 +350,11 @@ class boss_vazruden_the_herald : public CreatureScript
if (Creature* Vazruden = me->SummonCreature(NPC_VAZRUDEN, VazrudenMiddle[0], VazrudenMiddle[1], VazrudenMiddle[2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 6000000))
VazrudenGUID = Vazruden->GetGUID();
if (Creature* Nazan = me->SummonCreature(NPC_NAZAN, VazrudenMiddle[0], VazrudenMiddle[1], VazrudenMiddle[2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 6000000))
+ {
NazanGUID = Nazan->GetGUID();
+ if (Player* player = Nazan->SelectNearestPlayer(60.0f))
+ Nazan->AI()->AttackStart(player);
+ }
summoned = true;
me->SetVisible(false);
me->AddUnitState(UNIT_STATE_ROOT);
@@ -436,6 +441,10 @@ class boss_vazruden_the_herald : public CreatureScript
return;
}
}
+ if (!(Nazan && Nazan->IsAlive()) && !(Vazruden && Vazruden->IsAlive()))
+ {
+ me->DisappearAndDie();
+ }
check = 2000;
}
else