Illuna-Minetest/minetest_game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean tnt/init.lua (removed merge comment by git)

Browse Source
This commit is contained in:
tchncs 2016-03-14 10:13:00 +01:00
parent e14809616d
commit 0d9cc71396
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mods/tnt/init.lua
View File

@ -235,16 +235,11 @@ minetest.register_node("tnt:tnt", {
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
on_punch = function(pos, node, puncher) on_punch = function(pos, node, puncher)
if puncher:get_wielded_item():get_name() == "default:torch" then if puncher:get_wielded_item():get_name() == "default:torch" then
<<<<<<< HEAD
if(minetest.check_player_privs(puncher:get_player_name(), {trusted_player=true})) then if(minetest.check_player_privs(puncher:get_player_name(), {trusted_player=true})) then
minetest.sound_play("tnt_ignite", {pos=pos}) minetest.sound_play("tnt_ignite", {pos=pos})
minetest.set_node(pos, {name="tnt:tnt_burning"}) minetest.set_node(pos, {name="tnt:tnt_burning"})
minetest.get_node_timer(pos):start(4) minetest.get_node_timer(pos):start(4)
end end
=======
minetest.sound_play("tnt_ignite", {pos=pos})
minetest.set_node(pos, {name="tnt:tnt_burning"})
>>>>>>> dfee51c21e1131c9c80fc7382b000954962f8b49
end end
end, end,
on_blast = function(pos, intensity) on_blast = function(pos, intensity)