From b5c9ab88023c49ab0e3ab2365c789cd27a6629f1 Mon Sep 17 00:00:00 2001
From: Spp <spp@jorge.gr>
Date: Tue, 20 Nov 2012 12:30:30 +0100
Subject: Core/Misc: Reduction of header dependencies - Step II

---
 src/server/game/Globals/ObjectMgr.cpp | 44 ++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 21 deletions(-)

(limited to 'src/server/game/Globals/ObjectMgr.cpp')

diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 245079f2495..a94a12a99fe 100755
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -16,36 +16,38 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "AccountMgr.h"
+#include "AchievementMgr.h"
+#include "ArenaTeam.h"
+#include "ArenaTeamMgr.h"
+#include "Chat.h"
 #include "Common.h"
 #include "DatabaseEnv.h"
+#include "DisableMgr.h"
+#include "GameEventMgr.h"
+#include "GossipDef.h"
+#include "GroupMgr.h"
+#include "GuildMgr.h"
+#include "InstanceSaveMgr.h"
+#include "Language.h"
+#include "LFGMgr.h"
 #include "Log.h"
 #include "MapManager.h"
 #include "ObjectMgr.h"
-#include "ArenaTeamMgr.h"
-#include "GuildMgr.h"
-#include "GroupMgr.h"
+#include "Pet.h"
+#include "PoolMgr.h"
+#include "ReputationMgr.h"
+#include "ScriptMgr.h"
+#include "SpellAuras.h"
+#include "Spell.h"
 #include "SpellMgr.h"
-#include "UpdateMask.h"
-#include "World.h"
-#include "ArenaTeam.h"
+#include "SpellScript.h"
 #include "Transport.h"
-#include "Language.h"
-#include "GameEventMgr.h"
-#include "Spell.h"
-#include "Chat.h"
-#include "AccountMgr.h"
-#include "InstanceSaveMgr.h"
-#include "SpellAuras.h"
+#include "UpdateMask.h"
 #include "Util.h"
-#include "WaypointManager.h"
-#include "GossipDef.h"
 #include "Vehicle.h"
-#include "AchievementMgr.h"
-#include "DisableMgr.h"
-#include "ScriptMgr.h"
-#include "SpellScript.h"
-#include "PoolMgr.h"
-#include "LFGMgr.h"
+#include "WaypointManager.h"
+#include "World.h"
 
 ScriptMapMap sQuestEndScripts;
 ScriptMapMap sQuestStartScripts;
-- 
cgit v1.2.3


From 70d44f97dc80d06e77dfaa36de6ae11efd3d5d65 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Tue, 20 Nov 2012 12:48:00 +0100
Subject: Core/ObjectMgr: Fixed crash on shutdown

Closes #8362
---
 src/server/game/Globals/ObjectMgr.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/server/game/Globals/ObjectMgr.cpp')

diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index a94a12a99fe..ff734efe385 100755
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -264,16 +264,20 @@ ObjectMgr::~ObjectMgr()
     // free only if loaded
     for (int class_ = 0; class_ < MAX_CLASSES; ++class_)
     {
-        delete[] _playerClassInfo[class_]->levelInfo;
+        if (_playerClassInfo[class_])
+            delete[] _playerClassInfo[class_]->levelInfo;
         delete _playerClassInfo[class_];
     }
 
     for (int race = 0; race < MAX_RACES; ++race)
+    {
         for (int class_ = 0; class_ < MAX_CLASSES; ++class_)
         {
-            delete[] _playerInfo[race][class_]->levelInfo;
+            if (_playerInfo[race][class_])
+                delete[] _playerInfo[race][class_]->levelInfo;
             delete _playerInfo[race][class_];
         }
+    }
 
     for (CacheVendorItemContainer::iterator itr = _cacheVendorItemStore.begin(); itr != _cacheVendorItemStore.end(); ++itr)
         itr->second.Clear();
-- 
cgit v1.2.3