diff options
| author | Jelle Meeus <sogladev@gmail.com> | 2025-09-14 14:02:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-14 18:02:02 -0300 |
| commit | 3d828a65686467a08f3da4bbbd00d50e44cfc209 (patch) | |
| tree | 0e6f1797b8a858e755bb3582471455a9cada3f22 /src/server | |
| parent | 7a43b0f13ec35fa7726c5008d4673671a5775bcf (diff) | |
fix(World/WorldState): SI main event can only be disabled manually (#22911)
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/game/World/WorldState.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/server/game/World/WorldState.cpp b/src/server/game/World/WorldState.cpp index 83ed3b5c46..ebb11b8bfe 100644 --- a/src/server/game/World/WorldState.cpp +++ b/src/server/game/World/WorldState.cpp @@ -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); |