From: Novatux <nathanael.courant@laposte.net>
Date: Tue, 12 May 2015 14:53:04 +0000 (+0200)
Subject: Fix problems with TNT
X-Git-Tag: 0.4.13~75
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4bd1094619f8001fa4418465a03aecbeb7f93b5b;p=oweals%2Fminetest_game.git

Fix problems with TNT
---

diff --git a/mods/doors/init.lua b/mods/doors/init.lua
index 74c7eec6..ee08d954 100644
--- a/mods/doors/init.lua
+++ b/mods/doors/init.lua
@@ -121,15 +121,15 @@ function doors.register_door(name, def)
 		else
 			if door_type == "_b_1" or door_type == "_b_2" then
 				return function(pos, intensity)
-					check_and_blast(pos, name..door_type)
+					check_and_blast(pos, base_name .. door_type)
 					pos.y = pos.y + 1
-					check_and_blast(pos, name..other_door_type)
+					check_and_blast(pos, base_name .. other_door_type)
 				end
 			elseif door_type == "_t_1" or door_type == "_t_2" then
 				return function(pos, intensity)
-					check_and_blast(pos, name..door_type)
+					check_and_blast(pos, base_name .. door_type)
 					pos.y = pos.y - 1
-					check_and_blast(pos, name..other_door_type)
+					check_and_blast(pos, base_name .. other_door_type)
 				end
 			end
 		end
diff --git a/mods/tnt/init.lua b/mods/tnt/init.lua
index dfe0a230..44a6be40 100644
--- a/mods/tnt/init.lua
+++ b/mods/tnt/init.lua
@@ -80,16 +80,15 @@ local function destroy(drops, pos, cid)
 		return
 	end
 	local def = cid_data[cid]
+	if def and def.on_blast then
+		def.on_blast(pos, 1)
+		return
+	end
 	if def and def.flammable then
+		print(dump(def), dump(pos), cid)
 		minetest.set_node(pos, fire_node)
 	else
-		local on_blast = def.on_blast
-		if on_blast ~= nil then
-			on_blast(pos, 1)
-			return
-		else
-			minetest.remove_node(pos)
-		end
+		minetest.remove_node(pos)
 		if def then
 			local node_drops = minetest.get_node_drops(def.name, "")
 			for _, item in ipairs(node_drops) do