From 8527d684f4fa8e60058dd5c9d1a97cbf3c3fb7c2 Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Sun, 19 Feb 2017 22:48:46 +0100
Subject: [PATCH] Update mcl_fire itemstrings

---
 mods/ENTITIES/mobs/api.lua                       | 8 ++++----
 mods/ENTITIES/mobs_mc/blaze.lua                  | 2 +-
 mods/ITEMS/REDSTONE/mcl_dispensers/init.lua      | 2 +-
 mods/ITEMS/minetest-3d_armor/3d_armor/armor.conf | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mods/ENTITIES/mobs/api.lua b/mods/ENTITIES/mobs/api.lua
index 8c0d11e362..998ca65ac5 100644
--- a/mods/ENTITIES/mobs/api.lua
+++ b/mods/ENTITIES/mobs/api.lua
@@ -475,8 +475,8 @@ local do_env_damage = function(self)
 		-- lava or fire
 		if self.lava_damage ~= 0
 		and (nodef.groups.lava
-		or self.standing_in == "mcl_fire:basic_flame"
-		or self.standing_in == "mcl_fire:permanent_flame") then
+		or self.standing_in == "mcl_fire:fire"
+		or self.standing_in == "mcl_fire:eternal_fire") then
 
 			self.health = self.health - self.lava_damage
 
@@ -2594,7 +2594,7 @@ local c_air = minetest.get_content_id("air")
 local c_ignore = minetest.get_content_id("ignore")
 local c_obsidian = minetest.get_content_id("mcl_core:obsidian")
 local c_chest = minetest.get_content_id("mcl_core:chest")
-local c_fire = minetest.get_content_id("mcl_fire:basic_flame")
+local c_fire = minetest.get_content_id("mcl_fire:fire")
 
 -- explosion (cannot break protected or unbreakable nodes)
 function mobs:explosion(pos, radius, fire, smoke, sound)
@@ -2662,7 +2662,7 @@ function mobs:explosion(pos, radius, fire, smoke, sound)
 				and (minetest.registered_nodes[n].groups.flammable
 				or random(1, 100) <= 30) then
 
-					minetest.set_node(p, {name = "mcl_fire:basic_flame"})
+					minetest.set_node(p, {name = "mcl_fire:fire"})
 				else
 					minetest.set_node(p, {name = "air"})
 
diff --git a/mods/ENTITIES/mobs_mc/blaze.lua b/mods/ENTITIES/mobs_mc/blaze.lua
index 800975a06b..83300d69d3 100644
--- a/mods/ENTITIES/mobs_mc/blaze.lua
+++ b/mods/ENTITIES/mobs_mc/blaze.lua
@@ -94,7 +94,7 @@ mobs:register_arrow("mobs_mc:blaze_fireball", {
 	hit_node = function(self, pos, node)
 		local pos_above = {x=pos.x, y=pos.y+1, z=pos.z}
 		if minetest.registered_nodes[minetest.get_node(pos_above).name].buildable_to then
-			minetest.set_node(pos_above, {name="mcl_fire:basic_flame"})
+			minetest.set_node(pos_above, {name="mcl_fire:fire"})
 		end
 	end
 })
diff --git a/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua b/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua
index b91eb4b16b..e2eb2b9902 100644
--- a/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua
+++ b/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua
@@ -114,7 +114,7 @@ local dispenserdef = {
 				elseif iname == "mcl_fire:flint_and_steel" then
 					-- Ignite air or fire
 					if dropnode.name == "air" then
-						minetest.add_node(droppos, {name="mcl_fire:basic_flame"})
+						minetest.add_node(droppos, {name="mcl_fire:fire"})
 						if not minetest.setting_getbool("creative_mode") then
 							stack:add_wear(65535/65) -- 65 uses
 						end
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/armor.conf b/mods/ITEMS/minetest-3d_armor/3d_armor/armor.conf
index 7f912b53b7..96c62fac73 100644
--- a/mods/ITEMS/minetest-3d_armor/3d_armor/armor.conf
+++ b/mods/ITEMS/minetest-3d_armor/3d_armor/armor.conf
@@ -12,8 +12,8 @@ ARMOR_FIRE_PROTECT = false
 ARMOR_FIRE_NODES = {
 	{"default:lava_source",     5, 4},
 	{"default:lava_flowing",    5, 4},
-	{"mcl_fire:basic_flame",        3, 4},
-	{"mcl_fire:permanent_flame",    3, 4},
+	{"mcl_fire:fire",           3, 4},
+	{"mcl_fire:eternal_fire",   3, 4},
 }
 
 ARMOR_DROP = true