[furnace.lua] Won't use non-fuel items as fuel anymore.

Unarelith · Mar 1, 2020 · 86125bf · 86125bf
1 parent 1c21f89
commit 86125bf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/client/source/gui/InventoryWidget.cpp b/client/source/gui/InventoryWidget.cpp
@@ -99,7 +99,7 @@ bool InventoryWidget::receiveItemStack(const ItemWidget *itemStack, AbstractInve
 
 	if (stackAdded)
 		sendUpdatePacket();
-	else
+	else if (src == this)
 		m_inventory->setStack(itemStack->x(), itemStack->y(), stack.item().stringID(), stack.amount());
 
 	return stackAdded;

diff --git a/mods/default/furnace.lua b/mods/default/furnace.lua
@@ -175,6 +175,7 @@ mod:block {
 		end
 
 		if ticks_remaining == 0 and recipe and fuel_stack:amount() > 0 and
+				fuel_stack:item():is_fuel() and
 				(output_stack:item():id() == 0 or output_stack:amount() == 0
 				or output_stack:item():id() == recipe:result():item():id()) then
 			data.inventory:set_stack(2, 0, fuel_stack:item():stringID(), fuel_stack:amount() - 1)

diff --git a/server/source/lua/ScriptEngine.cpp b/server/source/lua/ScriptEngine.cpp
@@ -111,7 +111,8 @@ void ScriptEngine::initUsertypes() {
 	m_lua.new_usertype<Item>("Item",
 		"id", &Item::id,
 		"stringID", &Item::stringID,
-		"burn_time", &Item::burnTime
+		"burn_time", &Item::burnTime,
+		"is_fuel", &Item::isFuel
 	);
 
 	m_lua.new_usertype<glm::ivec3>("ivec3",