From 421b268716e36f39200e480bf23c6a9f5216b646 Mon Sep 17 00:00:00 2001
From: Wuzzy <Wuzzy2@mail.ru>
Date: Sun, 15 Sep 2019 10:48:27 +0200
Subject: [PATCH] Fix item entities not dropping when digging below

---
 mods/builtin_item/init.lua |  5 +++++
 mods/item_drop/init.lua    | 12 ++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/mods/builtin_item/init.lua b/mods/builtin_item/init.lua
index 7799078..43b408d 100644
--- a/mods/builtin_item/init.lua
+++ b/mods/builtin_item/init.lua
@@ -24,6 +24,7 @@ minetest.register_entity(
       
       itemstring = "",
       physical_state = true,
+      item_magnet = false, -- set by other mod that implements item magnet
 
       set_item = function(self, itemstring)
 		    self.itemstring = itemstring
@@ -115,6 +116,10 @@ minetest.register_entity(
 		      self.object:remove()
 		      return
 		   end
+
+		   if self.item_magnet then
+		      return
+		   end
 		   
 		   p.y = p.y - 0.3
 		   local nn = minetest.get_node(p).name
diff --git a/mods/item_drop/init.lua b/mods/item_drop/init.lua
index a9515b1..b20e249 100644
--- a/mods/item_drop/init.lua
+++ b/mods/item_drop/init.lua
@@ -48,7 +48,7 @@ minetest.register_globalstep(
 	    for _,object in ipairs(in_radius) do
 	       if not object:is_player() and object:get_luaentity()
                and object:get_luaentity().name == "__builtin:item" and valid(object) then
-                  local pos1 = pos
+                  local pos1 = table.copy(pos)
 
                   pos1.y = pos1.y + 0.2
 
@@ -71,11 +71,10 @@ minetest.register_globalstep(
                            vec.y = vec.y*3
                            vec.z = vec.z*3
 
+                           object:get_luaentity().item_magnet = true
                            object:set_velocity(vec)
+                           object:set_properties({ physical = false })
 
-                           object:get_luaentity().physical_state = false
-
-                           object:get_luaentity().object:set_properties({physical = false})
                         else
                            local lua = object:get_luaentity()
 
@@ -113,10 +112,7 @@ minetest.register_globalstep(
                      end
                   else
                      object:set_velocity({x = 0, y = object:get_velocity().y, z = 0})
-
-                     object:get_luaentity().physical_state = true
-
-                     object:get_luaentity().object:set_properties({physical = true})
+                     object:get_luaentity().item_magnet = false
                   end
                end
             end