Fix water node placement, and lava node placement. (Yes, nether lava too!)

This commit is contained in:
Michieal 2023-01-12 03:27:17 -05:00
parent a04d946879
commit d2625d3ace
1 changed files with 20 additions and 13 deletions

View File

@ -198,27 +198,34 @@ local bamboo_def = {
rand_height = pr:next(BAMBOO_MAX_HEIGHT - 4, BAMBOO_MAX_HEIGHT) rand_height = pr:next(BAMBOO_MAX_HEIGHT - 4, BAMBOO_MAX_HEIGHT)
end end
local _, position = minetest.item_place(place_item, placer, pointed_thing, fdir) local node_above_name = minetest.get_node(pointed_thing.above).name
if not minetest.is_creative_enabled(placer:get_player_name()) then minetest.log("\n\n\nnode_above name: " .. node_above_name)
itemstack:take_item(1) if node_above_name ~= "mcl_core:water_source" or node_above_name ~= "mcl_core:lava_source"
end or node_above_name ~= "mcl_nether:nether_lava_source" then
if rand_height and rand_height > 1 then local _, position = minetest.item_place(place_item, placer, pointed_thing, fdir)
if position then if not minetest.is_creative_enabled(placer:get_player_name()) then
mcl_bamboo.mcl_log("Setting Height Data...") itemstack:take_item(1)
meta = minetest.get_meta(position) end
if meta then if rand_height and rand_height > 1 then
meta:set_int("height", rand_height) if position then
mcl_bamboo.mcl_log("Setting Height Data...")
meta = minetest.get_meta(position)
if meta then
meta:set_int("height", rand_height)
end
end end
end end
return itemstack, pointed_thing.under
else
return
end end
return itemstack, pointed_thing.under
end, end,
on_destruct = function(pos) on_destruct = function(pos)
-- Node destructor; called before removing node. -- Node destructor; called before removing node.
local new_pos = vector.offset(pos, 0, 1, 0) local new_pos = vector.offset(pos, 0, 1, 0)
local node_above = minetest.get_node(new_pos) local node_above = minetest.get_node(new_pos)
local bamboo_node = string.sub(node_above.name, 1, string.len(BAMBOO)) local bamboo_node = mcl_bamboo.is_bamboo(node_above.name) or 0
local istack = ItemStack(BAMBOO) local istack = ItemStack(BAMBOO)
local sound_params = { local sound_params = {
pos = new_pos, pos = new_pos,
@ -226,7 +233,7 @@ local bamboo_def = {
max_hear_distance = 10, -- default, uses a Euclidean metric max_hear_distance = 10, -- default, uses a Euclidean metric
} }
if node_above and (bamboo_node == BAMBOO or node_above.name == BAMBOO_ENDCAP_NAME) then if node_above and ((bamboo_node and bamboo_node > 0) or node_above.name == BAMBOO_ENDCAP_NAME) then
minetest.remove_node(new_pos) minetest.remove_node(new_pos)
minetest.sound_play(node_sound.dug, sound_params, true) minetest.sound_play(node_sound.dug, sound_params, true)
if pr:next(1, DOUBLE_DROP_CHANCE) == 1 then if pr:next(1, DOUBLE_DROP_CHANCE) == 1 then