Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into Spells

2 files changed, 6 insertions, 6 deletions

diff --git a/src/server/game/DataStores/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h
index 7d2fd1c2b95..fa1ca29f4ef 100644
--- a/src/server/game/DataStores/DBCEnums.h
+++ b/src/server/game/DataStores/DBCEnums.h
@@ -51,11 +51,11 @@ enum LevelLimit
 enum BattlegroundBracketId                                  // bracketId for level ranges
 {
     BG_BRACKET_ID_FIRST          = 0,
-    BG_BRACKET_ID_LAST           = 15
-};
+    BG_BRACKET_ID_LAST           = 10,
 
-// must be max value in PvPDificulty slot+1
-#define MAX_BATTLEGROUND_BRACKETS  16
+    // must be max value in PvPDificulty slot + 1
+    MAX_BATTLEGROUND_BRACKETS
+};
 
 enum AreaTeams
 {
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 8b4fc341ab9..b6286eac5bb 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -17911,7 +17911,7 @@ void Player::_LoadInventory(PreparedQueryResult result, uint32 timeDiff)
 
                 uint8 err = EQUIP_ERR_OK;
                 // Item is not in bag
-                if (!bagGuid)
+                if (!bagGuid.GetCounter())
                 {
                     item->SetContainer(NULL);
                     item->SetSlot(slot);
@@ -27327,4 +27327,4 @@ uint32 Player::CalculateTalentsPoints() const
 {
     // 1 talent point for every 15 levels
     return getLevel() >= 100 ? 7 : uint32(floor(getLevel() / 15.f));
-}
\ No newline at end of file
+}