Athemis/MineClone2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Allow to light Nether portal with any fire

Browse source
This commit is contained in:
Wuzzy 2017-09-19 15:45:23 +02:00
parent 3857ff43ef
commit 70198eb50b
8 changed files with 40 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mods/ITEMS/mcl_fire/depends.txt
View file

@ -2,3 +2,4 @@ mcl_core
mcl_util
mcl_sounds
mcl_nether?
mcl_portals?

5
mods/ITEMS/mcl_fire/fire_charge.lua
View file

@ -19,7 +19,10 @@ minetest.register_craftitem("mcl_fire:fire_charge", {
if pointed_thing.type == "node" then
local nodedef = minetest.registered_nodes[node.name]
if nodedef and nodedef._on_ignite then
nodedef._on_ignite(user, pointed_thing)
local overwrite = nodedef._on_ignite(user, pointed_thing)
if not overwrite then
mcl_fire.set_fire(pointed_thing)
end
else
mcl_fire.set_fire(pointed_thing)
end

5
mods/ITEMS/mcl_fire/flint_and_steel.lua
View file

@ -25,7 +25,10 @@ minetest.register_tool("mcl_fire:flint_and_steel", {
if pointed_thing.type == "node" then
local nodedef = minetest.registered_nodes[minetest.get_node(pointed_thing.under).name]
if nodedef and nodedef._on_ignite then
nodedef._on_ignite(user, pointed_thing)
local overwrite = nodedef._on_ignite(user, pointed_thing)
if not overwrite then
mcl_fire.set_fire(pointed_thing)
end
else
mcl_fire.set_fire(pointed_thing)
end

18
mods/ITEMS/mcl_fire/init.lua
View file

@ -72,11 +72,18 @@ minetest.register_node("mcl_fire:fire", {
end,
drop = "",
sounds = {},
-- Turn into eternal fire on special blocks, light Nether portal (if possible), start burning timer
on_construct = function(pos)
local under = minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name
if under == "mcl_nether:magma" or under == "mcl_nether:netherrack" then
minetest.swap_node(pos, {name = "mcl_fire:eternal_fire"})
end
if minetest.get_modpath("mcl_portals") then
mcl_portals.light_nether_portal(pos)
end
minetest.get_node_timer(pos):start(math.random(3, 7))
end,
_mcl_blast_resistance = 0,
@ -126,8 +133,13 @@ minetest.register_node("mcl_fire:eternal_fire", {
-- Restart timer
minetest.get_node_timer(pos):start(math.random(3, 7))
end,
-- Start burning timer and light Nether portal (if possible)
on_construct = function(pos)
minetest.get_node_timer(pos):start(math.random(3, 7))
if minetest.get_modpath("mcl_portals") then
mcl_portals.light_nether_portal(pos)
end
end,
sounds = {},
drop = "",
@ -395,8 +407,9 @@ local eternal_override = {
local fn = minetest.get_node(flame_pos)
if fn.name == "air" and not minetest.is_protected(flame_pos, "fire") and pointed_thing.under.y < pointed_thing.above.y then
minetest.set_node(flame_pos, {name = "mcl_fire:eternal_fire"})
return true
else
mcl_fire.set_fire(pointed_thing)
return false
end
end,
}
@ -409,8 +422,9 @@ local eternal_override_end = {
local fn = minetest.get_node(flame_pos)
if dim == "end" and fn.name == "air" and not minetest.is_protected(flame_pos, "fire") and pointed_thing.under.y < pointed_thing.above.y then
minetest.set_node(flame_pos, {name = "mcl_fire:eternal_fire"})
return true
else
mcl_fire.set_fire(pointed_thing)
return false
end
end,
}