From c5a030b9e5e467141094b6a523025fa8d1b7d37c Mon Sep 17 00:00:00 2001
From: Joachim Stolberg <joe.stolberg@gmx.de>
Date: Sun, 16 May 2021 19:56:44 +0200
Subject: [PATCH] Fix ta4 chest take_item bug

---
 basic_machines/chest.lua | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/basic_machines/chest.lua b/basic_machines/chest.lua
index fd1882c..45fff30 100644
--- a/basic_machines/chest.lua
+++ b/basic_machines/chest.lua
@@ -16,6 +16,8 @@
 local M = minetest.get_meta
 local S = techage.S
 
+local TA4_INV_SIZE = 50
+
 local MP = minetest.get_modpath(minetest.get_current_modname())
 local mConf = dofile(MP.."/basis/conf_inv.lua")
 
@@ -345,30 +347,31 @@ techage.register_node({"techage:chest_ta4"}, {
 		local inv = meta:get_inventory()
 		local mem = techage.get_mem(pos)
 		
-		mem.filter = mem.filter or mConf.item_filter(pos, 50)
-		mem.chest_configured = mem.chest_configured or 
-				not mem.filter["unconfigured"] or #mem.filter["unconfigured"] < 50
+		mem.filter = mem.filter or mConf.item_filter(pos, TA4_INV_SIZE)
+		mem.chest_configured = mem.chest_configured or not inv:is_empty("conf")
 		
 		if inv:is_empty("main") then
 			return nil
 		end
 		
+print(1)		
 		if item_name then
-			if mem.filter[item_name] then -- configured item
-				local taken = inv:remove_item("main", {name = item_name, count = num})
-				if taken:get_count() > 0 then
-					return taken
-				end
-			elseif not mem.chest_configured then
+print(2)		
+			if mem.filter[item_name] or not mem.chest_configured then
+print(3)		
 				local taken = inv:remove_item("main", {name = item_name, count = num})
 				if taken:get_count() > 0 then
+print(4)		
 					return taken
 				end
 			end
 		else -- no item given
+print(5)		
 			if mem.chest_configured then
-				return mConf.take_item(pos, inv, "main", num, mem.filter["unconfigured"] or {})
+print(6)		
+				return mConf.take_item(pos, inv, "main", num, mem.filter["unconfigured"])
 			else
+print(7)		
 				return techage.get_items(pos, inv, "main", num)
 			end
 		end
@@ -378,9 +381,8 @@ techage.register_node({"techage:chest_ta4"}, {
 		local inv = meta:get_inventory()
 		local mem = techage.get_mem(pos)
 		
-		mem.filter = mem.filter or mConf.item_filter(pos, 50)
-		mem.chest_configured = mem.chest_configured or 
-				not mem.filter["unconfigured"] or #mem.filter["unconfigured"] < 50
+		mem.filter = mem.filter or mConf.item_filter(pos, TA4_INV_SIZE)
+		mem.chest_configured = mem.chest_configured or not inv:is_empty("conf")
 		
 		if mem.chest_configured then
 			local name = item:get_name()
@@ -395,9 +397,8 @@ techage.register_node({"techage:chest_ta4"}, {
 		local inv = meta:get_inventory()
 		local mem = techage.get_mem(pos)
 		
-		mem.filter = mem.filter or mConf.item_filter(pos, 50)
-		mem.chest_configured = mem.chest_configured or 
-				not mem.filter["unconfigured"] or #mem.filter["unconfigured"] < 50
+		mem.filter = mem.filter or mConf.item_filter(pos, TA4_INV_SIZE)
+		mem.chest_configured = mem.chest_configured or not inv:is_empty("conf")
 		
 		if mem.chest_configured then
 			local name = item:get_name()