mim
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

Fix crash when drinking milk when damage disabled

This commit is contained in:
Wuzzy 2017-08-31 23:13:51 +02:00
parent c315973648
commit 2fed50dbbe
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,7 +135,7 @@ minetest.register_craftitem("mcl_mobitems:cooked_rabbit", {
local drink_milk = function(itemstack, player, pointed_thing) local drink_milk = function(itemstack, player, pointed_thing)
local bucket = minetest.do_item_eat(0, "mcl_buckets:bucket_empty", itemstack, player, pointed_thing) local bucket = minetest.do_item_eat(0, "mcl_buckets:bucket_empty", itemstack, player, pointed_thing)
-- Check if we were allowed to drink this (eat delay check) -- Check if we were allowed to drink this (eat delay check)
if bucket:get_name() ~= "mcl_mobitems:milk_bucket" then if bucket:get_name() ~= "mcl_mobitems:milk_bucket" and mcl_hunger.active then
mcl_hunger.stop_poison(player) mcl_hunger.stop_poison(player)
end end
return bucket return bucket

9
mods/PLAYER/mcl_hunger/init.lua
View File

@ -7,6 +7,13 @@ end
mcl_hunger = {} mcl_hunger = {}
-- This variable tells you if the hunger gameplay mechanic is active.
-- IMPORTANT: If damage is disabled on load time, most of the functions are NOT
-- available! Check if mcl_hunger is active before using the API.
mcl_hunger.active = false
mcl_hunger.exhaust = function() end mcl_hunger.exhaust = function() end
mcl_hunger.HUD_TICK = 0.1 mcl_hunger.HUD_TICK = 0.1
@ -24,8 +31,6 @@ mcl_hunger.EXHAUST_LVL = 4000 -- at what exhaustion player saturation gets lower
mcl_hunger.SATURATION_INIT = 5 -- Initial saturation for new/respawning players mcl_hunger.SATURATION_INIT = 5 -- Initial saturation for new/respawning players
mcl_hunger.active = false
if minetest.settings:get_bool("enable_damage") then if minetest.settings:get_bool("enable_damage") then
mcl_hunger.active = true mcl_hunger.active = true