Update with latest 0.4.14 dev changes

This commit is contained in:
TenPlus1 2016-11-08 10:21:23 +00:00
parent 7c8147e35a
commit 9b294ee33b

View File

@ -93,38 +93,20 @@ minetest.register_tool("fire:flint_and_steel", {
local pt = pointed_thing local pt = pointed_thing
if pt.type == "node" then if pt.type == "node" then
local node_under = minetest.get_node(pt.under).name local node_under = minetest.get_node(pt.under).name
local is_coalblock = node_under == "default:coalblock" local nodedef = minetest.registered_nodes[node_under]
local is_tnt = node_under == "tnt:tnt" if not nodedef then
local is_gunpowder = node_under == "tnt:gunpowder" return
if minetest.get_item_group(node_under, "flammable") >= 1 or end
is_coalblock or is_tnt or is_gunpowder then local player_name = user:get_player_name()
local flame_pos = pt.above if minetest.is_protected(pt.under, player_name) then
if is_coalblock then minetest.chat_send_player(player_name, "This area is protected")
flame_pos = {x = pt.under.x, y = pt.under.y + 1, z = pt.under.z} return
elseif is_tnt or is_gunpowder then end
flame_pos = pt.under if nodedef.on_ignite then
end nodedef.on_ignite(pt.under, user)
if minetest.get_node(flame_pos).name == "air" or elseif minetest.get_item_group(node_under, "flammable") >= 1
is_tnt or is_gunpowder then and minetest.get_node(pt.above).name == "air" then
local player_name = user:get_player_name() minetest.set_node(pt.above, {name = "fire:basic_flame"})
if not minetest.is_protected(flame_pos, player_name) then
if is_coalblock then
minetest.set_node(flame_pos,
{name = "fire:permanent_flame"})
elseif is_tnt then
minetest.set_node(flame_pos,
{name = "tnt:tnt_burning"})
elseif is_gunpowder then
minetest.set_node(flame_pos,
{name = "tnt:gunpowder_burning"})
else
minetest.set_node(flame_pos,
{name = "fire:basic_flame"})
end
else
minetest.chat_send_player(player_name, "This area is protected")
end
end
end end
end end
if not minetest.setting_getbool("creative_mode") then if not minetest.setting_getbool("creative_mode") then
@ -152,6 +134,12 @@ minetest.override_item("default:coalblock", {
minetest.swap_node(pos, {name = "air"}) minetest.swap_node(pos, {name = "air"})
end end
end, end,
on_ignite = function(pos, igniter)
local flame_pos = {x = pos.x, y = pos.y + 1, z = pos.z}
if minetest.get_node(flame_pos).name == "air" then
minetest.set_node(flame_pos, {name = "fire:permanent_flame"})
end
end,
}) })