X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fserverobject.cpp;h=81307bc34f23a69d5f51f8e80bcc96d8b6fb6c9d;hb=58e6d25e033c76dc91aaac18fdeda92ac23fe0e1;hp=95735de17ce4a2f36aacba35ab40179acabfe12e;hpb=a0566270d9fa075afa36a7e3e68c690b1b23ba90;p=oweals%2Fminetest.git

diff --git a/src/serverobject.cpp b/src/serverobject.cpp
index 95735de17..81307bc34 100644
--- 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();