shacknetisp
/
kingdoms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix TNT protection testing.

master
Beha 2017-01-06 15:25:32 -05:00
parent 01a4767b77
commit bae41bb252
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bones/init.lua
View File

@ -59,8 +59,10 @@ minetest.register_node("bones:bones", {
if blast_items[minetest.pos_to_string(pos)] then
local c = blast_items[minetest.pos_to_string(pos)]
blast_items[minetest.pos_to_string(pos)] = nil
minetest.remove_node(pos)
return c
end
minetest.remove_node(pos)
end,
can_dig = function(pos, player)

22
tnt/init.lua
View File

@ -326,17 +326,23 @@ local function tnt_explode(pos, radius, ignore_protection, ignore_on_blast, on_b
end
function tnt.boom(pos, def)
if not def.ignore_protection and minetest.is_protected(pos, "") then
return
end
local on_blast_queue = {}
local ndef = minetest.registered_nodes[minetest.get_node(pos).name]
if ndef.on_blast and not def.ignore_on_blast then
on_blast_queue[#on_blast_queue + 1] = {pos = vector.new(pos), on_blast = ndef.on_blast}
end
if ndef.on_pre_blast and not def.ignore_on_blast then
ndef.on_pre_blast(pos)
end
minetest.sound_play("tnt_explode", {pos = pos, gain = 1.5, max_hear_distance = 2*64})
minetest.set_node(pos, {name = "tnt:boom"})
minetest.get_node_timer(pos):start(0.5)
if (not ndef.on_blast and not ndef.on_pre_blast) or def.ignore_on_blast then
minetest.set_node(pos, {name = "tnt:boom"})
minetest.get_node_timer(pos):start(0.5)
else
if ndef.on_blast and not def.ignore_on_blast then
on_blast_queue[#on_blast_queue + 1] = {pos = vector.new(pos), on_blast = ndef.on_blast}
end
if ndef.on_pre_blast and not def.ignore_on_blast then
ndef.on_pre_blast(pos)
end
end
local drops = tnt_explode(pos, def.radius, def.ignore_protection,
def.ignore_on_blast, on_blast_queue)
entity_physics(pos, def.damage_radius)