Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 17:54:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Scripts: Fixed some delayed enrage

Browse Source
This commit is contained in:
Aokromes
2018-02-16 03:26:36 +01:00
parent 12b9563b4e
commit 4721d9814b
10 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
View File

@@ -106,11 +106,11 @@ public:
if (!UpdateVictim())
return;
events.Update(diff);
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
events.Update(diff);
while (uint32 eventId = events.ExecuteEvent())
{
switch (eventId)

4
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
View File

@@ -182,11 +182,11 @@ class boss_baltharus_the_warborn : public CreatureScript
if (!events.IsInPhase(PHASE_INTRO))
me->SetHealth(instance->GetData(DATA_BALTHARUS_SHARED_HEALTH));
events.Update(diff);
if (!events.IsInPhase(PHASE_INTRO) && me->HasUnitState(UNIT_STATE_CASTING))
return;
events.Update(diff);
while (uint32 eventId = events.ExecuteEvent())
{
switch (eventId)

4
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
View File

@@ -123,11 +123,11 @@ class boss_general_zarithrian : public CreatureScript
if (!UpdateVictim())
return;
events.Update(diff);
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
events.Update(diff);
while (uint32 eventId = events.ExecuteEvent())
{
switch (eventId)

5
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
View File

@@ -311,11 +311,14 @@ class boss_halion : public CreatureScript
if (events.IsInPhase(PHASE_TWO))
return;
if (!UpdateVictim() || me->HasUnitState(UNIT_STATE_CASTING))
if (!UpdateVictim())
return;
events.Update(diff);
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
while (uint32 eventId = events.ExecuteEvent())
{
switch (eventId)

4
src/server/scripts/Northrend/IsleOfConquest/boss_ioc_horde_alliance.cpp
View File

@@ -79,11 +79,11 @@ public:
if (!UpdateVictim())
return;
_events.Update(diff);
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
_events.Update(diff);
while (uint32 eventId = _events.ExecuteEvent())
{
switch (eventId)

4
src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp
View File

@@ -180,11 +180,11 @@ public:
if (!UpdateVictim())
return;
events.Update(diff);
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
events.Update(diff);
while (uint32 eventId = events.ExecuteEvent())
{
switch (eventId)

4
src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp
View File

@@ -206,11 +206,11 @@ public:
if (!UpdateVictim())
return;
events.Update(diff);
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
events.Update(diff);
while (uint32 eventId = events.ExecuteEvent())
{
switch (eventId)

4
src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
View File

@@ -262,11 +262,11 @@ public:
if (!UpdateVictim())
return;
events.Update(diff);
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
events.Update(diff);
while (uint32 eventId = events.ExecuteEvent())
{
switch (eventId)

4
src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
View File

@@ -172,11 +172,11 @@ public:
if (!events.IsInPhase(PHASE_INTRO) && !UpdateVictim())
return;
events.Update(diff);
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
events.Update(diff);
while (uint32 eventId = events.ExecuteEvent())
{
switch (eventId)

8
src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
View File

@@ -218,11 +218,14 @@ class boss_magtheridon : public CreatureScript
void UpdateAI(uint32 diff) override
{
if (me->HasUnitState(UNIT_STATE_CASTING))
if (!events.IsInPhase(PHASE_BANISH) && !UpdateVictim())
return;
events.Update(diff);
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
while (uint32 eventId = events.ExecuteEvent())
{
switch (eventId)
@@ -291,9 +294,6 @@ class boss_magtheridon : public CreatureScript
return;
}
if (!UpdateVictim())
return;
DoMeleeAttackIfReady();
}