From cb3b42efe47fcf53527c033654878635c7c3f39c Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Tue, 17 Jun 2014 13:03:24 +0200 Subject: [PATCH] Fix issue #1275 - wielded index greater than inv size. --- src/game.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/game.cpp b/src/game.cpp index 609ca1a1..c2ee7f31 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -2581,10 +2581,8 @@ void the_game(bool &kill, bool random_input, InputHandler *input, ItemStack playeritem; { InventoryList *mlist = local_inventory.getList("main"); - if(mlist != NULL) - { + if((mlist != NULL) && (client.getPlayerItem() < mlist->getSize())) playeritem = mlist->getItem(client.getPlayerItem()); - } } const ItemDefinition &playeritem_def = playeritem.getDefinition(itemdef); @@ -3332,7 +3330,7 @@ void the_game(bool &kill, bool random_input, InputHandler *input, // Update wielded tool InventoryList *mlist = local_inventory.getList("main"); ItemStack item; - if(mlist != NULL) + if((mlist != NULL) && (client.getPlayerItem() < mlist->getSize())) item = mlist->getItem(client.getPlayerItem()); camera.wield(item, client.getPlayerItem()); }