Crash Fix after b99c347

3 files changed, 15 insertions, 18 deletions

diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index d55d070614a..3b1f47b8f69 100755
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -20,25 +20,21 @@
 #define _PLAYER_H
 
 #include "AchievementMgr.h"
-#include "Bag.h"
 #include "Common.h"
 #include "DatabaseEnv.h"
 #include "DBCEnums.h"
 #include "GroupReference.h"
-#include "ItemPrototype.h"
 #include "Item.h"
 #include "MapReference.h"
-#include "NPCHandler.h"
 #include "Pet.h"
 #include "QuestDef.h"
 #include "ReputationMgr.h"
 #include "Unit.h"
-#include "Util.h"                                           // for Tokens typedef
 #include "WorldSession.h"
 #include "SpellMgr.h"
 
-#include<string>
-#include<vector>
+#include <string>
+#include <vector>
 
 struct Mail;
 class Channel;
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 6af9ffdf235..d17478bf30a 100755
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -2950,6 +2950,9 @@ PetLevelInfo const* ObjectMgr::GetPetLevelInfo(uint32 creature_id, uint8 level)
 
 void ObjectMgr::PlayerCreateInfoAddItemHelper(uint32 race_, uint32 class_, uint32 itemId, int32 count)
 {
+    if (!_playerInfo[race_][class_])
+        return;
+
     if (count > 0)
         _playerInfo[race_][class_]->item.push_back(PlayerCreateInfoItem(itemId, count));
     else
@@ -3239,8 +3242,8 @@ void ObjectMgr::LoadPlayerInfo()
                     continue;
                 }
 
-                PlayerInfo* pInfo = _playerInfo[current_race][current_class];
-                pInfo->action.push_back(PlayerCreateInfoAction(fields[2].GetUInt16(), fields[3].GetUInt32(), fields[4].GetUInt16()));
+                if (PlayerInfo* info = _playerInfo[current_race][current_class])
+                    info->action.push_back(PlayerCreateInfoAction(fields[2].GetUInt16(), fields[3].GetUInt32(), fields[4].GetUInt16()));
 
                 ++count;
             }
@@ -3380,16 +3383,14 @@ void ObjectMgr::LoadPlayerInfo()
                 continue;
             }
 
-            PlayerInfo* pInfo = _playerInfo[current_race][current_class];
-
-            if (!pInfo->levelInfo)
-                pInfo->levelInfo = new PlayerLevelInfo[sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)];
-
-            PlayerLevelInfo* pLevelInfo = &pInfo->levelInfo[current_level-1];
-
-            for (int i = 0; i < MAX_STATS; i++)
+            if (PlayerInfo* info = _playerInfo[current_race][current_class])
             {
-                pLevelInfo->stats[i] = fields[i+3].GetUInt8();
+                if (!info->levelInfo)
+                    info->levelInfo = new PlayerLevelInfo[sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)];
+
+                PlayerLevelInfo& levelInfo = info->levelInfo[current_level-1];
+                for (int i = 0; i < MAX_STATS; i++)
+                    levelInfo.stats[i] = fields[i+3].GetUInt8();
             }
 
             ++count;
diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h
index 1fa3148504a..e79544e7315 100755
--- a/src/server/shared/Packets/ByteBuffer.h
+++ b/src/server/shared/Packets/ByteBuffer.h
@@ -372,7 +372,7 @@ class ByteBuffer
             lt.tm_mon = (packedDate >> 20) & 0xF;
             lt.tm_year = ((packedDate >> 24) & 0x1F) + 100;
 
-            return mktime(&lt) + timezone;
+            return uint32(mktime(&lt) + timezone);
         }
 
         ByteBuffer& ReadPackedTime(uint32& time)