From 644a479e284a02a66a2809f7b484391781ffaf3e Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Tue, 23 Jan 2024 00:23:59 +0100
Subject: [PATCH] Core/Database: Fixed HotfixDatabase not being closed on
 shutdown with --update-databases-only

Closes #29599
---
 src/server/game/World/World.cpp | 2 --
 src/server/worldserver/Main.cpp | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 3b29a643deb..bb55881deaa 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -1812,8 +1812,6 @@ void World::SetInitialWorldSettings()
     sDB2Manager.LoadHotfixData(m_availableDbcLocaleMask);
     TC_LOG_INFO("misc", "Loading hotfix optional data...");
     sDB2Manager.LoadHotfixOptionalData(m_availableDbcLocaleMask);
-    ///- Close hotfix database - it is only used during DB2 loading
-    HotfixDatabase.Close();
     ///- Load M2 fly by cameras
     LoadM2Cameras(m_dataPath);
     ///- Load GameTables
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 1695294f13b..117932add7e 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -675,8 +675,9 @@ bool StartDB()
 
 void StopDB()
 {
-    CharacterDatabase.Close();
+    HotfixDatabase.Close();
     WorldDatabase.Close();
+    CharacterDatabase.Close();
     LoginDatabase.Close();
 
     MySQL::Library_End();