From 0d9cc71396aee3d14c1fec18ad4057f38a3a6f6b Mon Sep 17 00:00:00 2001 From: tchncs Date: Mon, 14 Mar 2016 10:13:00 +0100 Subject: [PATCH] clean tnt/init.lua (removed merge comment by git) --- mods/tnt/init.lua | 5 ----- 1 file changed, 5 deletions(-) diff --git a/mods/tnt/init.lua b/mods/tnt/init.lua index d7ff4122..be448644 100644 --- a/mods/tnt/init.lua +++ b/mods/tnt/init.lua @@ -235,16 +235,11 @@ 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)