Node highlighting.

[oweals/minetest.git] / src / serverobject.cpp

diff --git a/src/serverobject.cpp b/src/serverobject.cpp
index 95735de17ce4a2f36aacba35ab40179acabfe12e..81307bc34f23a69d5f51f8e80bcc96d8b6fb6c9d 100644 (file)
--- a/src/serverobject.cpp
+++ b/src/serverobject.cpp
@@ -78,7 +78,7 @@ ItemStack ServerActiveObject::getWieldedItem() const
        if(inv)
        {
                const InventoryList *list = inv->getList(getWieldList());
-               if(list)
+               if(list && (getWieldIndex() < (s32)list->getSize())) 
                        return list->getItem(getWieldIndex());
        }
        return ItemStack();