From d395c82183252f08832b10d9f3c8906f9c371cc9 Mon Sep 17 00:00:00 2001 From: cora Date: Tue, 29 Nov 2022 12:19:27 +0100 Subject: [PATCH] Fix bonemeal creative for sweet berries and nether vines --- mods/ITEMS/mcl_crimson/init.lua | 20 ++++++++++++++------ mods/ITEMS/mcl_farming/sweet_berry.lua | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/mods/ITEMS/mcl_crimson/init.lua b/mods/ITEMS/mcl_crimson/init.lua index b57a6f4d2..55bfbb6b5 100644 --- a/mods/ITEMS/mcl_crimson/init.lua +++ b/mods/ITEMS/mcl_crimson/init.lua @@ -118,15 +118,19 @@ minetest.register_node("mcl_crimson:twisting_vines", { node_placement_prediction = "", on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) local pn = clicker:get_player_name() - if clicker:is_player() and minetest.is_protected(vector.offset(pos,0,1,0), pn) then + if clicker:is_player() and minetest.is_protected(vector.offset(pos,0,1,0), pn or "") then minetest.record_protection_violation(vector.offset(pos,0,1,0), pn) return itemstack end if clicker:get_wielded_item():get_name() == "mcl_crimson:twisting_vines" then - itemstack:take_item() + if not minetest.is_creative_enabled(clicker:get_player_name()) then + itemstack:take_item() + end grow_vines(pos, 1, "mcl_crimson:twisting_vines") elseif clicker:get_wielded_item():get_name() == "mcl_dye:white" then - itemstack:take_item() + if not minetest.is_creative_enabled(clicker:get_player_name()) then + itemstack:take_item() + end grow_vines(pos, math.random(1, 3),"mcl_crimson:twisting_vines") end return itemstack @@ -170,15 +174,19 @@ minetest.register_node("mcl_crimson:weeping_vines", { node_placement_prediction = "", on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) local pn = clicker:get_player_name() - if clicker:is_player() and minetest.is_protected(vector.offset(pos,0,1,0), pn) then + if clicker:is_player() and minetest.is_protected(vector.offset(pos,0,1,0), pn or "") then minetest.record_protection_violation(vector.offset(pos,0,1,0), pn) return itemstack end if clicker:get_wielded_item():get_name() == "mcl_crimson:weeping_vines" then - itemstack:take_item() + if not minetest.is_creative_enabled(clicker:get_player_name()) then + itemstack:take_item() + end grow_vines(pos, 1, "mcl_crimson:weeping_vines", -1) elseif clicker:get_wielded_item():get_name() == "mcl_dye:white" then - itemstack:take_item() + if not minetest.is_creative_enabled(clicker:get_player_name()) then + itemstack:take_item() + end grow_vines(pos, math.random(1, 3),"mcl_crimson:weeping_vines", -1) end return itemstack diff --git a/mods/ITEMS/mcl_farming/sweet_berry.lua b/mods/ITEMS/mcl_farming/sweet_berry.lua index 1639915b6..be5c7ef2c 100644 --- a/mods/ITEMS/mcl_farming/sweet_berry.lua +++ b/mods/ITEMS/mcl_farming/sweet_berry.lua @@ -72,7 +72,7 @@ minetest.register_craftitem("mcl_farming:sweet_berry", { on_secondary_use = minetest.item_eat(1), on_place = function(itemstack, placer, pointed_thing) local pn = placer:get_player_name() - if placer:is_player() and minetest.is_protected(pointed_thing.above, pn) then + if placer:is_player() and minetest.is_protected(pointed_thing.above, pn or "") then minetest.record_protection_violation(pointed_thing.above, pn) return itemstack end