diff options
Diffstat (limited to 'src/server/game/World')
| -rw-r--r-- | src/server/game/World/World.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 5ef6c149bc9..f4c188434c4 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -2914,14 +2914,9 @@ void World::ShutdownServ(uint32 time, uint32 options, uint8 exitcode, const std: m_ShutdownMask = options; m_ExitCode = exitcode; - ///- If the shutdown time is 0, set m_stopEvent (except if shutdown is 'idle' with remaining sessions) + ///- If the shutdown time is 0, evaluate shutdown on next tick (no message) if (time == 0) - { - if (!(options & SHUTDOWN_MASK_IDLE) || GetActiveAndQueuedSessionCount() == 0) - m_stopEvent = true; // exist code already set - else - m_ShutdownTimer = 1; //So that the session count is re-evaluated at next world tick - } + m_ShutdownTimer = 1; ///- Else set the shutdown timer and warn users else { |