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

This commit is contained in:
Jelle Meeus
2025-09-14 14:02:02 -07:00
committed by GitHub
parent 7a43b0f13e
commit 3d828a6568

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);