atomdmac
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request 'Quick fix: Reinstate nil check in on_place_bucket.' (#2018) from kabou/MineClone2:fix-buckets-cauldrons into master 

Reviewed-on: MineClone2/MineClone2#2018
Reviewed-by: AFCMS <afcms@noreply.git.minetest.land>
Reviewed-by: cora <cora@noreply.git.minetest.land>
This commit is contained in:
cora 2022-02-21 19:54:35 +00:00
parent a0b5e4dd0b af132cc523
commit dcfbfd67b8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,7 +169,7 @@ local function on_place_bucket(itemstack, user, pointed_thing, def)
local undernode = get_node(pointed_thing.under) local undernode = get_node(pointed_thing.under)
local abovenode = get_node(pointed_thing.above) local abovenode = get_node(pointed_thing.above)
if registered_nodes[undernode.name].buildable_to or get_item_group(undernode.name, "cauldron") == 1 then if registered_nodes[undernode.name] and registered_nodes[undernode.name].buildable_to or get_item_group(undernode.name, "cauldron") == 1 then
local result, take_bucket = get_extra_check(def.extra_check, pointed_thing.under, user) local result, take_bucket = get_extra_check(def.extra_check, pointed_thing.under, user)
if result then if result then
local node_place = get_node_place(def.source_place, pointed_thing.under) local node_place = get_node_place(def.source_place, pointed_thing.under)
@ -190,7 +190,7 @@ local function on_place_bucket(itemstack, user, pointed_thing, def)
end end
end end
return get_bucket_drop(itemstack, user, take_bucket) return get_bucket_drop(itemstack, user, take_bucket)
elseif registered_nodes[abovenode.name].buildable_to or get_item_group(abovenode.name, "cauldron") == 1 then elseif registered_nodes[abovenode.name] and registered_nodes[abovenode.name].buildable_to or get_item_group(abovenode.name, "cauldron") == 1 then
local result, take_bucket = get_extra_check(def.extra_check, pointed_thing.above, user) local result, take_bucket = get_extra_check(def.extra_check, pointed_thing.above, user)
if result then if result then
local node_place = get_node_place(def.source_place, pointed_thing.above) local node_place = get_node_place(def.source_place, pointed_thing.above)