From 9b04b285b74aa5c96192d82700bf9d08d0e4dbbe Mon Sep 17 00:00:00 2001
From: 3raven <elise_declerck@laposte.net>
Date: Tue, 12 Apr 2022 22:08:33 +0000
Subject: [PATCH] Make the shield drop at death

---
 mods/PLAYER/mcl_death_drop/init.lua | 113 ++++++++++++++--------------
 1 file changed, 57 insertions(+), 56 deletions(-)

diff --git a/mods/PLAYER/mcl_death_drop/init.lua b/mods/PLAYER/mcl_death_drop/init.lua
index bfeee0c3e..5ea548ecc 100644
--- a/mods/PLAYER/mcl_death_drop/init.lua
+++ b/mods/PLAYER/mcl_death_drop/init.lua
@@ -1,56 +1,57 @@
-local random = math.random
-
-local ipairs = ipairs
-
-mcl_death_drop = {}
-
-mcl_death_drop.registered_dropped_lists = {}
-
-function mcl_death_drop.register_dropped_list(inv, listname, drop)
-	table.insert(mcl_death_drop.registered_dropped_lists, {inv = inv, listname = listname, drop = drop})
-end
-
-mcl_death_drop.register_dropped_list("PLAYER", "main", true)
-mcl_death_drop.register_dropped_list("PLAYER", "craft", true)
-mcl_death_drop.register_dropped_list("PLAYER", "armor", true)
-
-minetest.register_on_dieplayer(function(player)
-	local keep = minetest.settings:get_bool("mcl_keepInventory", false)
-	if keep == false then
-		-- Drop inventory, crafting grid and armor
-		local playerinv = player:get_inventory()
-		local pos = player:get_pos()
-		-- No item drop if in deep void
-		local _, void_deadly = mcl_worlds.is_in_void(pos)
-
-		for l=1,#mcl_death_drop.registered_dropped_lists do
-			local inv = mcl_death_drop.registered_dropped_lists[l].inv
-			if inv == "PLAYER" then
-				inv = playerinv
-			elseif type(inv) == "function" then
-				inv = inv(player)
-			end
-			local listname = mcl_death_drop.registered_dropped_lists[l].listname
-			local drop = mcl_death_drop.registered_dropped_lists[l].drop
-			if inv then
-				for i, stack in ipairs(inv:get_list(listname)) do
-					local x = random(0, 9)/3
-					local z = random(0, 9)/3
-					pos.x = pos.x + x
-					pos.z = pos.z + z
-					if not void_deadly and drop and not mcl_enchanting.has_enchantment(stack, "curse_of_vanishing") then
-						local def = minetest.registered_items[stack:get_name()]
-						if def and def.on_drop then
-							stack = def.on_drop(stack, player, pos)
-						end
-						minetest.add_item(pos, stack)
-					end
-					pos.x = pos.x - x
-					pos.z = pos.z - z
-				end
-				inv:set_list(listname, {})
-			end
-		end
-		mcl_armor.update(player)
-	end
-end)
+local random = math.random
+
+local ipairs = ipairs
+
+mcl_death_drop = {}
+
+mcl_death_drop.registered_dropped_lists = {}
+
+function mcl_death_drop.register_dropped_list(inv, listname, drop)
+	table.insert(mcl_death_drop.registered_dropped_lists, {inv = inv, listname = listname, drop = drop})
+end
+
+mcl_death_drop.register_dropped_list("PLAYER", "main", true)
+mcl_death_drop.register_dropped_list("PLAYER", "craft", true)
+mcl_death_drop.register_dropped_list("PLAYER", "armor", true)
+mcl_death_drop.register_dropped_list("PLAYER", "offhand", true)
+
+minetest.register_on_dieplayer(function(player)
+	local keep = minetest.settings:get_bool("mcl_keepInventory", false)
+	if keep == false then
+		-- Drop inventory, crafting grid and armor
+		local playerinv = player:get_inventory()
+		local pos = player:get_pos()
+		-- No item drop if in deep void
+		local _, void_deadly = mcl_worlds.is_in_void(pos)
+
+		for l=1,#mcl_death_drop.registered_dropped_lists do
+			local inv = mcl_death_drop.registered_dropped_lists[l].inv
+			if inv == "PLAYER" then
+				inv = playerinv
+			elseif type(inv) == "function" then
+				inv = inv(player)
+			end
+			local listname = mcl_death_drop.registered_dropped_lists[l].listname
+			local drop = mcl_death_drop.registered_dropped_lists[l].drop
+			if inv then
+				for i, stack in ipairs(inv:get_list(listname)) do
+					local x = random(0, 9)/3
+					local z = random(0, 9)/3
+					pos.x = pos.x + x
+					pos.z = pos.z + z
+					if not void_deadly and drop and not mcl_enchanting.has_enchantment(stack, "curse_of_vanishing") then
+						local def = minetest.registered_items[stack:get_name()]
+						if def and def.on_drop then
+							stack = def.on_drop(stack, player, pos)
+						end
+						minetest.add_item(pos, stack)
+					end
+					pos.x = pos.x - x
+					pos.z = pos.z - z
+				end
+				inv:set_list(listname, {})
+			end
+		end
+		mcl_armor.update(player)
+	end
+end)