diff options
| author | JacobF <queatz@gmail.com> | 2011-08-25 19:27:50 -0400 |
|---|---|---|
| committer | JacobF <queatz@gmail.com> | 2011-08-25 19:27:50 -0400 |
| commit | 134e49cc8e442e582608411832363e15f68ea6eb (patch) | |
| tree | 3da141aefcfd33680f40b95f66ee99a31543c353 /src/server.cpp | |
| parent | efd8dabd913b2d1a0564378c30ae86c7a5081f06 (diff) | |
| download | minetest-134e49cc8e442e582608411832363e15f68ea6eb.tar.gz minetest-134e49cc8e442e582608411832363e15f68ea6eb.tar.bz2 minetest-134e49cc8e442e582608411832363e15f68ea6eb.zip | |
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
Diffstat (limited to 'src/server.cpp')
| -rw-r--r-- | src/server.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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"<<std::endl; return; |