test

mods/tnt/init.lua

@@ -235,11 +235,16 @@ minetest.register_node("tnt:tnt", {
 	sounds = default.node_sound_wood_defaults(),
 	on_punch = function(pos, node, puncher)
 		if puncher:get_wielded_item():get_name() == "default:torch" then
+<<<<<<< HEAD
 			if(minetest.check_player_privs(puncher:get_player_name(), {trusted_player=true})) then
 				minetest.sound_play("tnt_ignite", {pos=pos})
 				minetest.set_node(pos, {name="tnt:tnt_burning"})
 				minetest.get_node_timer(pos):start(4)
 			end
+=======
+			minetest.sound_play("tnt_ignite", {pos=pos})
+			minetest.set_node(pos, {name="tnt:tnt_burning"})
+>>>>>>> dfee51c21e1131c9c80fc7382b000954962f8b49
 		end
 	end,
 	on_blast = function(pos, intensity)
@@ -263,6 +268,9 @@ minetest.register_node("tnt:tnt_burning", {
 	light_source = 5,
 	drop = "",
 	sounds = default.node_sound_wood_defaults(),
+	on_construct = function(pos)
+		minetest.get_node_timer(pos):start(4)
+	end,
 	on_timer = boom,
 	-- unaffected by explosions
 	on_blast = function() end,
@@ -383,7 +391,7 @@ minetest.register_node("tnt:gunpowder_burning", {
 minetest.register_abm({
 	nodenames = {"tnt:tnt", "tnt:gunpowder"},
 	neighbors = {"fire:basic_flame", "default:lava_source", "default:lava_flowing"},
-	interval = 1,
+	interval = 4,
 	chance = 1,
 	action = burn,
 })
@@ -402,8 +410,3 @@ minetest.register_craft({
 		{"",           "group:wood",    ""}
 	}
 })
-
-if minetest.setting_get("log_mods") then
-	minetest.debug("[TNT] Loaded!")
-end
-