*Fix a typo in 3806 that makes players item is mailed back.

*Also a missing part of last rev.

--HG--
branch : trunk

2 files changed, 5 insertions, 6 deletions

diff --git a/src/game/NPCHandler.cpp b/src/game/NPCHandler.cpp
index 72fa626fdcb..c60d368659a 100644
--- a/src/game/NPCHandler.cpp
+++ b/src/game/NPCHandler.cpp
@@ -823,13 +823,8 @@ void WorldSession::HandleStableSwapPet( WorldPacket & recv_data )
     _player->RemovePet(pet,pet->isAlive() ? PetSaveMode(slot) : PET_SAVE_AS_DELETED);
 
     // summon unstabled pet
-<<<<<<< HEAD:src/game/NPCHandler.cpp
     Pet *newpet = new Pet(_player);
-    if(!newpet->LoadPetFromDB(_player,petentry,pet_number))
-=======
-    Pet *newpet = new Pet;
     if(!newpet->LoadPetFromDB(_player,creature_id,pet_number))
->>>>>>> b8ce292c7048fb8c4e4a06971c3859efe2421f28:src/game/NPCHandler.cpp
     {
         delete newpet;
         data << uint8(0x06);
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 8bbb27a61d9..eba21fa5f99 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -15057,10 +15057,14 @@ void Player::_LoadInventory(QueryResult *result, uint32 timediff)
                 if(itr != bagMap.end())
                 {
                     ItemPosCountVec dest;
-                    if(CanStoreItem(itr->second->GetBagSlot(), slot, dest, item))
+                    uint8 result = CanStoreItem(itr->second->GetSlot(), slot, dest, item);
+                    if(result == EQUIP_ERR_OK)
                         itr->second->StoreItem(slot, item, true );
                     else
+                    {
+                        sLog.outError("Player::_LoadInventory: Player %s has item (GUID: %u Entry: %u) can't be loaded to inventory (Bag GUID: %u Slot: %u) by reason %u.", GetName(),item_guid, item_id, bag_guid, slot, result);
                         success = false;
+                    }
                 }
                 else
                     success = false;