check for real_torch mod and disable built-in torch drop function
This commit is contained in:
parent
b35e024008
commit
0eb5854067
@ -91,6 +91,7 @@ lucky_block:add_blocks({
|
|||||||
{name = "ethereal:fishing_rod", max = 1},
|
{name = "ethereal:fishing_rod", max = 1},
|
||||||
{name = "ethereal:worm", max = 10},
|
{name = "ethereal:worm", max = 10},
|
||||||
}},
|
}},
|
||||||
|
{"dro", {"ethereal:lemon"}, 9},
|
||||||
})
|
})
|
||||||
|
|
||||||
if minetest.get_modpath("3d_armor") then
|
if minetest.get_modpath("3d_armor") then
|
||||||
|
24
water.lua
24
water.lua
@ -127,21 +127,12 @@ minetest.register_abm({
|
|||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
-- If torch touching water then drop as item (when enabled)
|
-- when enabled, drop torches that are touching water
|
||||||
if ethereal.torchdrop == true then
|
if ethereal.torchdrop == true and not minetest.get_modpath("real_torch") then
|
||||||
|
|
||||||
local torch_drop = "default:torch"
|
|
||||||
local drop_sound = "fire_extinguish_flame"
|
|
||||||
|
|
||||||
if minetest.get_modpath("real_torch") then
|
|
||||||
torch_drop = "real_torch:torch"
|
|
||||||
drop_sound = "real_torch_extinguish"
|
|
||||||
end
|
|
||||||
|
|
||||||
minetest.register_abm({
|
minetest.register_abm({
|
||||||
label = "Ethereal drop torch",
|
label = "Ethereal drop torch",
|
||||||
nodenames = {"default:torch", "default:torch_wall", "default:torch_ceiling",
|
nodenames = {"default:torch", "default:torch_wall", "default:torch_ceiling"},
|
||||||
"real_torch:torch", "real_torch:torch_wall", "real_torch:torch_ceiling"},
|
|
||||||
neighbors = {"group:water"},
|
neighbors = {"group:water"},
|
||||||
interval = 5,
|
interval = 5,
|
||||||
chance = 1,
|
chance = 1,
|
||||||
@ -171,12 +162,11 @@ minetest.register_abm({
|
|||||||
|
|
||||||
minetest.set_node(pos, {name = "air"})
|
minetest.set_node(pos, {name = "air"})
|
||||||
|
|
||||||
minetest.sound_play({name = drop_sound, gain = 0.2},
|
minetest.sound_play("fire_extinguish_flame",
|
||||||
{pos = pos, max_hear_distance = 10})
|
{pos = pos, gain = 0.2, max_hear_distance = 10})
|
||||||
|
|
||||||
minetest.add_item(pos, {name = torch_drop})
|
minetest.add_item(pos, {name = "default:torch"})
|
||||||
end
|
end
|
||||||
end,
|
end
|
||||||
})
|
})
|
||||||
|
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user