Mirrorlandia_minetest/MineClone2
1
0
Fork 0
mirror of https://git.minetest.land/MineClone2/MineClone2.git synced 2024-11-20 01:43:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'Fix Cauldrons' (#4615) from fix-cauldrons into master

Browse Source 
Reviewed-on: https://git.minetest.land/VoxeLibre/VoxeLibre/pulls/4615
Reviewed-by: Mikita Wiśniewski <rudzik8@protonmail.com>
This commit is contained in:
the-real-herowl 2024-08-30 16:12:55 +02:00
commit a3cc105fa1
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mods/ITEMS/mcl_buckets/init.lua
View File

@ -209,7 +209,7 @@ local function on_place_bucket_empty(itemstack, user, pointed_thing)
-- Call on_rightclick if the pointed node defines it -- Call on_rightclick if the pointed node defines it
local new_stack = mcl_util.call_on_rightclick(itemstack, user, pointed_thing) local new_stack = mcl_util.call_on_rightclick(itemstack, user, pointed_thing)
if new_stack then if new_stack and new_stack ~= itemstack then
return new_stack return new_stack
end end

19
mods/ITEMS/mcl_potions/init.lua
View File

@ -61,10 +61,9 @@ minetest.register_craftitem("mcl_potions:glass_bottle", {
local def = minetest.registered_nodes[node.name] local def = minetest.registered_nodes[node.name]
-- Call on_rightclick if the pointed node defines it -- Call on_rightclick if the pointed node defines it
if placer and not placer:get_player_control().sneak then local new_stack = mcl_util.call_on_rightclick(itemstack, placer, pointed_thing)
if def and def.on_rightclick then if new_stack and new_stack ~= itemstack then
return def.on_rightclick(pointed_thing.under, node, placer, itemstack) or itemstack return new_stack
end
end end
-- Try to fill glass bottle with water -- Try to fill glass bottle with water
@ -226,10 +225,9 @@ local function water_bottle_on_place(itemstack, placer, pointed_thing)
local def = minetest.registered_nodes[node.name] local def = minetest.registered_nodes[node.name]
-- Call on_rightclick if the pointed node defines it -- Call on_rightclick if the pointed node defines it
if placer and not placer:get_player_control().sneak then local new_stack = mcl_util.call_on_rightclick(itemstack, placer, pointed_thing)
if def and def.on_rightclick then if new_stack and new_stack ~= itemstack then
return def.on_rightclick(pointed_thing.under, node, placer, itemstack) or itemstack return new_stack
end
end end
local cauldron = nil local cauldron = nil
@ -239,11 +237,10 @@ local function water_bottle_on_place(itemstack, placer, pointed_thing)
cauldron = fill_cauldron(node.name, "mclx_core:river_water_source") cauldron = fill_cauldron(node.name, "mclx_core:river_water_source")
end end
if cauldron then if cauldron then
set_node_empty_bottle(itemstack, placer, pointed_thing, cauldron) return set_node_empty_bottle(itemstack, placer, pointed_thing, cauldron)
elseif node.name == "mcl_core:dirt" or node.name == "mcl_core:coarse_dirt" then elseif node.name == "mcl_core:dirt" or node.name == "mcl_core:coarse_dirt" then
set_node_empty_bottle(itemstack, placer, pointed_thing, "mcl_mud:mud") return set_node_empty_bottle(itemstack, placer, pointed_thing, "mcl_mud:mud")
end end
end end