nalc/server-nalc
1
0
Fork 0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2025-06-28 06:11:47 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/Ombridride/minetest-minetestforfun-server

Browse Source 
Conflicts:
	mods/nether/nether/items.lua
This commit is contained in:
LeMagnesium
2014-10-29 22:28:40 +01:00
parent fa97a1934e a1529c8ce8
commit 88b167c8ef
1915 changed files with 96 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mods/nether/nether/items.lua
View File

@ -368,8 +368,13 @@ minetest.register_node("nether:apple", {
end
local amount = math.random(4, 6)
local p_hunger = tonumber(hud.hunger[user:get_player_name()])
<<<<<<< HEAD
if not p_hunger then return end
p_hunger = p_hunger+9
=======
--if not p_hunger then return end -- test si résoud notre problème avec le nether fruit
p_hunger = p_hunger+3
>>>>>>> a1529c8ce87c71e1cca87e885c36dcdacb2be296
if p_hunger > 30 then p_hunger = 30 end
hud.hunger[user:get_player_name()] = p_hunger
hud.set_hunger(user)