nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-03-15 13:35:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Util): EventMap::RepeatEvent when eventId is retrieved by ExecuteEvent() call (#3426)

Browse Source
This commit is contained in:
Andrius Peleckas
2020-10-17 15:59:22 +03:00
committed by GitHub
parent 32da0eeb9e
commit ab5933effa
131 changed files with 558 additions and 1012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
View File

@@ -181,7 +181,6 @@ public:
case EVENT_KRIK_HEALTH_CHECK:
if (HealthBelowPct(10))
{
events.PopEvent();
me->CastSpell(me, SPELL_FRENZY, true);
break;
}

2
src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
View File

@@ -120,7 +120,7 @@ public:
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
switch (events.GetEvent())
switch (events.ExecuteEvent())
{
case EVENT_AMANITAR_SPAWN:
{

4
src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
View File

@@ -161,7 +161,7 @@ public:
if( me->HasUnitState(UNIT_STATE_CASTING) )
return;
switch ( events.GetEvent() )
switch ( events.ExecuteEvent() )
{
case EVENT_CHECK_HEALTH:
{
@@ -177,7 +177,6 @@ public:
{
Talk(EMOTE_HATCHES, me);
SummonHelpers(false);
events.PopEvent();
break;
}
case EVENT_BROOD_RAGE:
@@ -208,7 +207,6 @@ public:
if (me->GetPositionZ() < 24)
{
me->CastSpell(me, SPELL_ENRAGE, true);
events.PopEvent();
break;
}

2
src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
View File

@@ -238,7 +238,7 @@ public:
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
switch (events.GetEvent())
switch (events.ExecuteEvent())
{
case EVENT_HERALD_HEALTH:
{

4
src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
View File

@@ -335,7 +335,7 @@ public:
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
switch (events.GetEvent())
switch (events.ExecuteEvent())
{
case EVENT_JEDOGA_CYCLONE:
{
@@ -361,7 +361,6 @@ public:
}
case EVENT_JEDOGA_MOVE_UP:
{
events.PopEvent();
if (!summons.HasEntry(NPC_INITIATE))
break;
@@ -383,7 +382,6 @@ public:
Talk(TEXT_SACRIFICE_2);
summons.DespawnEntry(NPC_JEDOGA_CONTROLLER);
MoveDown();
events.PopEvent();
break;
}
}

5
src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
View File

@@ -145,7 +145,7 @@ public:
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
switch (events.GetEvent())
switch (events.ExecuteEvent())
{
case EVENT_PRINCE_BLOODTHIRST:
{
@@ -174,7 +174,6 @@ public:
}
case EVENT_PRINCE_VANISH:
{
events.PopEvent();
//Count alive players
uint8 count = 0;
Unit* pTarget;
@@ -208,13 +207,11 @@ public:
me->RemoveAura(SPELL_VANISH);
}
events.PopEvent();
events.ScheduleEvent(EVENT_PRINCE_RESCHEDULE, 20000);
break;
}
case EVENT_PRINCE_RESCHEDULE:
{
events.PopEvent();
ScheduleEvents();
break;
}