Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix issue #1275 - wielded index greater than inv size.

This commit is contained in:
RealBadAngel 2014-06-17 13:03:24 +02:00
parent a0f78659f3
commit cb3b42efe4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/game.cpp
View File

@ -2581,10 +2581,8 @@ void the_game(bool &kill, bool random_input, InputHandler *input,
ItemStack playeritem; ItemStack playeritem;
{ {
InventoryList *mlist = local_inventory.getList("main"); InventoryList *mlist = local_inventory.getList("main");
if(mlist != NULL) if((mlist != NULL) && (client.getPlayerItem() < mlist->getSize()))
{
playeritem = mlist->getItem(client.getPlayerItem()); playeritem = mlist->getItem(client.getPlayerItem());
}
} }
const ItemDefinition &playeritem_def = const ItemDefinition &playeritem_def =
playeritem.getDefinition(itemdef); playeritem.getDefinition(itemdef);
@ -3332,7 +3330,7 @@ void the_game(bool &kill, bool random_input, InputHandler *input,
// Update wielded tool // Update wielded tool
InventoryList *mlist = local_inventory.getList("main"); InventoryList *mlist = local_inventory.getList("main");
ItemStack item; ItemStack item;
if(mlist != NULL) if((mlist != NULL) && (client.getPlayerItem() < mlist->getSize()))
item = mlist->getItem(client.getPlayerItem()); item = mlist->getItem(client.getPlayerItem());
camera.wield(item, client.getPlayerItem()); camera.wield(item, client.getPlayerItem());
} }