Refactored singletons to enable proper deconstruction during shutdown

2 files changed, 4 insertions, 4 deletions

diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h
index 990d5e80c1a..e028833d72d 100644
--- a/src/server/game/Maps/MapManager.h
+++ b/src/server/game/Maps/MapManager.h
@@ -32,8 +32,8 @@ class MapManager
     public:
         static MapManager* instance()
         {
-            static MapManager* instance = new MapManager();
-            return instance;
+            static MapManager instance;
+            return &instance;
         }
 
         Map* CreateBaseMap(uint32 mapId);
diff --git a/src/server/game/Maps/TransportMgr.h b/src/server/game/Maps/TransportMgr.h
index 6ebc6316710..04c372cc526 100644
--- a/src/server/game/Maps/TransportMgr.h
+++ b/src/server/game/Maps/TransportMgr.h
@@ -100,8 +100,8 @@ class TransportMgr
     public:
         static TransportMgr* instance()
         {
-            static TransportMgr* instance = new TransportMgr();
-            return instance;
+            static TransportMgr instance;
+            return &instance;
         }
 
         void Unload();