diff options
| author | runningnak3d <runningnak3d@gmail.com> | 2011-03-18 09:41:04 -0600 |
|---|---|---|
| committer | runningnak3d <runningnak3d@gmail.com> | 2011-03-18 09:41:04 -0600 |
| commit | 2f89fa9e69129a9d231c9f5183a69fd7e1c11735 (patch) | |
| tree | 1c0ad1650bbacbf5f517f4c06d716e9482262936 /src/server/game | |
| parent | 171268a565003cb760b4efff35e8d71a7b9df6b7 (diff) | |
| parent | 489e62943788a02d25255ce819c0c74869907d26 (diff) | |
Merge branch 'master' of git@github.com:TrinityCore/TrinityCore
Diffstat (limited to 'src/server/game')
| -rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 8665227ef29..fe784b1ec9e 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -10046,7 +10046,8 @@ Bag* Player::GetBagByPos(uint8 bag) const { if ((bag >= INVENTORY_SLOT_BAG_START && bag < INVENTORY_SLOT_BAG_END) || (bag >= BANK_SLOT_BAG_START && bag < BANK_SLOT_BAG_END)) - return GetItemByPos(INVENTORY_SLOT_BAG_0, bag)->ToBag(); + if (Item* item = GetItemByPos(INVENTORY_SLOT_BAG_0, bag)) + return item->ToBag(); return NULL; } |