From fa3cd83f5af8b0a0dafe2de7c286f236ae0caf05 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Tue, 23 May 2017 02:09:47 +0200 Subject: [PATCH] Prevent eating cake if full --- mods/ITEMS/mcl_cake/init.lua | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/mods/ITEMS/mcl_cake/init.lua b/mods/ITEMS/mcl_cake/init.lua index d5149fc26..6056331bc 100644 --- a/mods/ITEMS/mcl_cake/init.lua +++ b/mods/ITEMS/mcl_cake/init.lua @@ -49,8 +49,11 @@ minetest.register_node("mcl_cake:cake", { groups = {handy=1, cake=7, food=2,no_eat_delay=1, attached_node=1, dig_by_piston=1}, drop = '', on_rightclick = function(pos, node, clicker, itemstack) - minetest.do_item_eat(2, ItemStack("mcl_cake:cake_6"), ItemStack("mcl_cake:cake"), clicker, {type="nothing"}) - minetest.add_node(pos,{type="node",name="mcl_cake:cake_6",param2=0}) + local newcake = minetest.do_item_eat(2, ItemStack("mcl_cake:cake_6"), ItemStack("mcl_cake:cake"), clicker, {type="nothing"}) + -- Check if we were allowed to eat + if newcake:get_name() ~= "mcl_cake:cake" then + minetest.add_node(pos,{type="node",name="mcl_cake:cake_6",param2=0}) + end end, sounds = mcl_sounds.node_sound_leaves_defaults(), @@ -66,14 +69,21 @@ local register_slice = function(level, nodebox, desc) local on_rightclick if level > 1 then on_rightclick = function(pos, node, clicker, itemstack) - minetest.do_item_eat(2, ItemStack(after_eat), ItemStack(this), clicker, {type="nothing"}) - minetest.add_node(pos,{type="node",name=after_eat,param2=0}) + local newcake = minetest.do_item_eat(2, ItemStack(after_eat), ItemStack(this), clicker, {type="nothing"}) + -- Check if we were allowed to eat + if newcake:get_name() ~= this then + minetest.add_node(pos,{type="node",name=after_eat,param2=0}) + end end else + -- Last slice on_rightclick = function(pos, node, clicker, itemstack) - minetest.do_item_eat(2, ItemStack("mcl:cake:cake 0"), ItemStack("mcl_cake:cake_1"), clicker, {type="nothing"}) - minetest.remove_node(pos) - core.check_for_falling(pos) + local newcake = minetest.do_item_eat(2, ItemStack("mcl:cake:cake 0"), ItemStack("mcl_cake:cake_1"), clicker, {type="nothing"}) + -- Check if we were allowed to eat + if newcake:get_name() ~= this then + minetest.remove_node(pos) + core.check_for_falling(pos) + end end end