Merged trunk changes from revision 2618 to 2716 into the 0.1.0 branch.

1 files changed, 3 insertions, 8 deletions

diff --git a/src/net/inventoryhandler.cpp b/src/net/inventoryhandler.cpp
index c4192bc5..3f7e8709 100644
--- a/src/net/inventoryhandler.cpp
+++ b/src/net/inventoryhandler.cpp
@@ -92,14 +92,9 @@ void InventoryHandler::handleMessage(MessageIn &msg)
             if (msg.readByte()> 0) {
                 chatWindow->chatLog("Unable to pick up item", BY_SERVER);
             } else {
-                ItemInfo *itemInfo = itemDb->getItemInfo(itemId);
-                if (itemInfo) {
-                    chatWindow->chatLog("You picked up a " +
-                                        itemInfo->getName(), BY_SERVER);
-                } else {
-                    chatWindow->chatLog("You picked up an unknown item",
-                                        BY_SERVER);
-                }
+                const ItemInfo &itemInfo = itemDb->getItemInfo(itemId);
+                chatWindow->chatLog("You picked up a " +
+                        itemInfo.getName(), BY_SERVER);
                 player_node->addInvItem(index, itemId, amount, equipType != 0);
             }
             break;