From dc7fbce09a0f422f35e03ef41306682db59b38c0 Mon Sep 17 00:00:00 2001
From: tenplus1 <tenplus1@users.noreply.github.com>
Date: Sun, 5 Feb 2023 16:44:17 +0000
Subject: [PATCH] Change Fire Protection Function (#100)

* Tweak Fire Protect

This change tweaks the fire protection function so that it no longer needs to override nodes and hence rely on additional dependencies like ethereal mod.

* Remove ethereal and fire dependencies

Remove fire and ethereal dependencies as they are no longer needed since fire protection doesn't override items inside those mods.

* Re-add Torch Damage

This re-adds torch damage of 1 per second if fire protection is enabled.

* Remove nether dependency

Nether dependency isn't required as well.
---
 3d_armor/init.lua | 24 +++++++-----------------
 3d_armor/mod.conf |  2 +-
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/3d_armor/init.lua b/3d_armor/init.lua
index 9f82d30..6465555 100644
--- a/3d_armor/init.lua
+++ b/3d_armor/init.lua
@@ -477,22 +477,14 @@ minetest.register_globalstep(function(dtime)
 	end
 end)
 
--- Fire Protection, added by TenPlus1.
 if armor.config.fire_protect == true then
-	-- override any hot nodes that do not already deal damage
-	for _, row in pairs(armor.fire_nodes) do
-		if minetest.registered_nodes[row[1]] then
-			local damage = minetest.registered_nodes[row[1]].damage_per_second
-			if not damage or damage == 0 then
-				minetest.override_item(row[1], {damage_per_second = row[3]})
-			end
-		end
-	end
-else
-	print ("[3d_armor] Fire Nodes disabled")
-end
 
-if armor.config.fire_protect == true then
+	-- make torches hurt
+	minetest.override_item("default:torch", {damage_per_second = 1})
+	minetest.override_item("default:torch_wall", {damage_per_second = 1})
+	minetest.override_item("default:torch_ceiling", {damage_per_second = 1})
+
+	-- check player damage for any hot nodes we may be protected against
 	minetest.register_on_player_hpchange(function(player, hp_change, reason)
 
 		if reason.type == "node_damage" and reason.node then
@@ -501,9 +493,7 @@ if armor.config.fire_protect == true then
 				local name = player:get_player_name()
 				for _,igniter in pairs(armor.fire_nodes) do
 					if reason.node == igniter[1] then
-						if armor.def[name].fire < igniter[2] then
-							armor:punch(player, "fire")
-						else
+						if armor.def[name].fire >= igniter[2] then
 							hp_change = 0
 						end
 					end
diff --git a/3d_armor/mod.conf b/3d_armor/mod.conf
index de567a3..f41c727 100644
--- a/3d_armor/mod.conf
+++ b/3d_armor/mod.conf
@@ -1,4 +1,4 @@
 name = 3d_armor
 depends = default, player_api
-optional_depends = player_monoids, armor_monoid, pova, fire, ethereal, moreores, nether
+optional_depends = player_monoids, armor_monoid, pova, moreores
 description = Adds craftable armor that is visible to other players.