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

Don't skip night if not all players are asleep

This commit is contained in:
Wuzzy 2019-02-20 16:18:13 +01:00
parent 8982e368ec
commit 3b8fe6039e
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mods/ITEMS/mcl_beds/functions.lua
View File

@ -161,15 +161,18 @@ local function lay_down(player, pos, bed_pos, state, skip)
end end
local function update_formspecs(finished) local function update_formspecs(finished)
if is_sp then
return
end
local ges = #minetest.get_connected_players() local ges = #minetest.get_connected_players()
local form_n local form_n
local all_in_bed = ges == player_in_bed local all_in_bed = ges == player_in_bed
if finished then if finished then
form_n = mcl_beds.formspec .. "label[2.7,11; Good morning.]" form_n = mcl_beds.formspec .. "label[2.7,11;Good morning.]"
else else
form_n = mcl_beds.formspec .. "label[2.2,11;" .. tostring(player_in_bed) .. form_n = mcl_beds.formspec .. "label[2.2,11;" .. tostring(player_in_bed) ..
" of " .. tostring(ges) .. " players are in bed]" " of " .. tostring(ges) .. " players are in bed]"
end end
for name,_ in pairs(mcl_beds.player) do for name,_ in pairs(mcl_beds.player) do
@ -272,10 +275,10 @@ function mcl_beds.on_rightclick(pos, player)
-- skip the night and let all players stand up -- skip the night and let all players stand up
if check_in_beds() then if check_in_beds() then
minetest.after(5, function() minetest.after(5, function()
if not is_sp then if check_in_beds() then
update_formspecs(is_night_skip_enabled()) update_formspecs(is_night_skip_enabled())
mcl_beds.sleep()
end end
mcl_beds.sleep()
end) end)
end end
end end
@ -294,8 +297,10 @@ minetest.register_on_leaveplayer(function(player)
mcl_beds.player[name] = nil mcl_beds.player[name] = nil
if check_in_beds() then if check_in_beds() then
minetest.after(5, function() minetest.after(5, function()
update_formspecs(is_night_skip_enabled()) if check_in_beds() then
mcl_beds.sleep() update_formspecs(is_night_skip_enabled())
mcl_beds.sleep()
end
end) end)
end end
end) end)