aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/World
diff options
context:
space:
mode:
authorTreeston <treeston.mmoc@gmail.com>2019-08-04 02:19:34 +0200
committerTreeston <treeston.mmoc@gmail.com>2019-08-04 02:19:34 +0200
commit2d74652b5bfb4455791ff872fac13fb0f6bcc02a (patch)
treee096a8b078786c29a00cd64da78c4b383df5545c /src/server/game/World
parent4a219eda07c353139608065f7d0a016094ee4ce0 (diff)
Core/Chat: Always save channel info to database on shutdown if persistence is enabled.
Diffstat (limited to 'src/server/game/World')
-rw-r--r--src/server/game/World/World.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 2e6cd80558a..50db5f7d34d 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -2283,7 +2283,7 @@ void World::Update(uint32 diff)
sWhoListStorageMgr->Update();
}
- if (m_timers[WUPDATE_CHANNEL_SAVE].Passed())
+ if (IsStopped() || m_timers[WUPDATE_CHANNEL_SAVE].Passed())
{
m_timers[WUPDATE_CHANNEL_SAVE].Reset();
@@ -2963,7 +2963,7 @@ void World::ShutdownMsg(bool show, Player* player, const std::string& reason)
/// Cancel a planned server shutdown
uint32 World::ShutdownCancel()
{
- // nothing cancel or too later
+ // nothing cancel or too late
if (!m_ShutdownTimer || m_stopEvent)
return 0;