From f811009c807e2349ec4cd41d4ee868feb0e570e1 Mon Sep 17 00:00:00 2001
From: Hybrid Dog <ovvv@web.de>
Date: Mon, 11 Sep 2017 14:35:55 +0200
Subject: [PATCH] Don't override handle_node_drops in creative mode

---
 init.lua         | 53 ++++++++++++++++++------------------------------
 settingtypes.txt |  2 +-
 2 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/init.lua b/init.lua
index f673878..24e12a2 100644
--- a/init.lua
+++ b/init.lua
@@ -203,21 +203,9 @@ if minetest.settings:get_bool("item_drop.enable_item_pickup") ~= false then
 	minetest.after(3.0, pickup_step)
 end
 
-if minetest.settings:get_bool("item_drop.enable_item_drop") ~= false then
-	local creative_enabled = minetest.settings:get_bool("creative_mode")
-
-	function minetest.handle_node_drops(pos, drops, digger)
-
-		local inv
-		local diggerPos = pos
-
-		if creative_enabled
-		and digger
-		and digger:is_player() then
-			inv = digger:get_inventory()
-			diggerPos = digger:getpos()
-		end
-
+if minetest.settings:get_bool("item_drop.enable_item_drop") ~= false
+and not minetest.settings:get_bool("creative_mode") then
+	function minetest.handle_node_drops(pos, drops)
 		for i = 1,#drops do
 			local item = drops[i]
 			local count, name
@@ -229,25 +217,24 @@ if minetest.settings:get_bool("item_drop.enable_item_drop") ~= false then
 				name = item:get_name()
 			end
 
-			if not inv
-			or not inv:contains_item("main", ItemStack(name)) then
-				for _ = 1,count do
-					local obj = minetest.add_item(diggerPos, name)
-
-					if obj then
-						obj:get_luaentity().collect = true
-						local x = math.random(-5, 4)
-						if x >= 0 then
-							x = x+1
-						end
-						local z = math.random(-5, 4)
-						if z >= 0 then
-							z = z+1
-						end
-
-						obj:setvelocity({x=1/x, y=obj:getvelocity().y, z=1/z})
-					end
+			for _ = 1,count do
+				local obj = minetest.add_item(pos, name)
+				if not obj then
+					error("Couldn't spawn item")
 				end
+
+				local vel = obj:getvelocity()
+				local x = math.random(-5, 4)
+				if x >= 0 then
+					x = x+1
+				end
+				vel.x = x
+				local z = math.random(-5, 4)
+				if z >= 0 then
+					z = z+1
+				end
+				vel.z = z
+				obj:setvelocity(vel)
 			end
 		end
 	end
diff --git a/settingtypes.txt b/settingtypes.txt
index 288ac95..d4f02e6 100644
--- a/settingtypes.txt
+++ b/settingtypes.txt
@@ -1,7 +1,7 @@
 #Pick up items automatically
 item_drop.enable_item_pickup (Enable item pickups) bool true
 
-#Drop items in-world on dig
+#Drop items in-world on dig, does nothing in creative mode
 item_drop.enable_item_drop (Enable item drops) bool true
 
 #Use a key to pick up items