ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

fix(World/WorldState): SI main event can only be disabled manually (#22911)

Browse source
This commit is contained in:
Jelle Meeus 2025-09-14 14:02:02 -07:00 • committed by GitHub
parent 7a43b0f13e
commit 3d828a6568
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/server/game/World/WorldState.cpp
View file

@ -1443,6 +1443,8 @@ void WorldState::StopScourgeInvasion()
sGameEventMgr->StopEvent(GAME_EVENT_SCOURGE_INVASION_BLASTED_LANDS);
sGameEventMgr->StopEvent(GAME_EVENT_SCOURGE_INVASION_EASTERN_PLAGUELANDS);
sGameEventMgr->StopEvent(GAME_EVENT_SCOURGE_INVASION_BURNING_STEPPES);
sGameEventMgr->StopEvent(GAME_EVENT_SCOURGE_INVASION_INVASIONS_DONE);
sGameEventMgr->StopEvent(GAME_EVENT_SCOURGE_INVASION_BOSSES);
BroadcastSIWorldstates();
m_siData.Reset();
@ -1582,7 +1584,8 @@ void WorldState::HandleDefendedZones()
}
else if (m_siData.m_battlesWon >= sWorld->getIntConfig(CONFIG_SCOURGEINVASION_COUNTER_THIRD))
{
sGameEventMgr->StopEvent(GAME_EVENT_SCOURGE_INVASION);
// The event is enabled via command, so we expect it to be disabled via command as well.
// sGameEventMgr->StopEvent(GAME_EVENT_SCOURGE_INVASION);
sGameEventMgr->StopEvent(GAME_EVENT_SCOURGE_INVASION_50_INVASIONS);
sGameEventMgr->StopEvent(GAME_EVENT_SCOURGE_INVASION_100_INVASIONS);
sGameEventMgr->StartEvent(GAME_EVENT_SCOURGE_INVASION_INVASIONS_DONE);