From 134e49cc8e442e582608411832363e15f68ea6eb Mon Sep 17 00:00:00 2001 From: JacobF Date: Thu, 25 Aug 2011 19:27:50 -0400 Subject: Merged 2 branches because they relied on each other. This one contains these changes from main c55: * Adds a function to check if there is room for a specific item * Using that, you can now pick up rats if you have a full inventory and a not full rat stack * Furnace would cook only 1 item if that item used the last available result slot, now it will continue * Furnace will say it's overloaded * Furnace won't wait until the next step to start on the next item - This caused small fuels to cook slower than meant to - Also caused furnaces to say they were out of fuel after finishing the last fuel item --- src/server.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server.cpp') diff --git a/src/server.cpp b/src/server.cpp index a8eb68c55..daa1e5d86 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2446,7 +2446,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) if(g_settings.getBool("creative_mode") == false) { // Skip if inventory has no free space - if(ilist->getUsedSlots() == ilist->getSize()) + if(ilist->roomForItem(item) == false) { dout_server<<"Player inventory has no free space"<