From 418289e41c69c9ed9ab75946d1661a5d830dd823 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Sun, 2 Jan 2022 19:50:35 -0500
Subject: [PATCH] Core/Chat: Always save channel info to database on shutdown
 if persistence is enabled.

Port From (https://github.com/TrinityCore/TrinityCore/commit/a18268156ab5a0e455637f1eb42120edc64a0497)
---
 Source/Game/Server/WorldManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Game/Server/WorldManager.cs b/Source/Game/Server/WorldManager.cs
index 6e12a1dab..f9b031898 100644
--- a/Source/Game/Server/WorldManager.cs
+++ b/Source/Game/Server/WorldManager.cs
@@ -1293,7 +1293,7 @@ namespace Game
                 Global.WhoListStorageMgr.Update();
             }
 
-            if (m_timers[WorldTimers.ChannelSave].Passed())
+            if (IsStopped || m_timers[WorldTimers.ChannelSave].Passed())
             {
                 m_timers[WorldTimers.ChannelSave].Reset();
 
@@ -1866,7 +1866,7 @@ namespace Game
 
         public uint ShutdownCancel()
         {
-            // nothing cancel or too later
+            // nothing cancel or too late
             if (m_ShutdownTimer == 0 || IsStopped)
                 return 0;