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

Fix wrong time checks in mcl_beds

This commit is contained in:
cora 2022-09-05 17:25:50 +02:00
parent 847e37c81f
commit dadb39dd92
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,6 +58,12 @@ local monster_exceptions = {
["mobs_mc:shulker"] = true, ["mobs_mc:shulker"] = true,
} }
function mcl_beds.is_night()
-- Values taken from Minecraft Wiki with offset of +600
local tod = ( minetest.get_timeofday() * 24000 ) % 24000
return tod > 18541 or tod < 5458
end
local function lay_down(player, pos, bed_pos, state, skip) local function lay_down(player, pos, bed_pos, state, skip)
local name = player:get_player_name() local name = player:get_player_name()
local hud_flags = player:hud_get_flags() local hud_flags = player:hud_get_flags()
@ -79,10 +85,8 @@ local function lay_down(player, pos, bed_pos, state, skip)
awards.unlock(player:get_player_name(), "mcl:sweetDreams") awards.unlock(player:get_player_name(), "mcl:sweetDreams")
end end
-- Check day of time and weather
local tod = minetest.get_timeofday() * 24000 if not mcl_beds.is_night() and (not weather_mod or (mcl_weather.get_weather() ~= "thunder")) then
-- Values taken from Minecraft Wiki with offset of +6000
if tod < 18541 and tod > 5458 and (not weather_mod or (mcl_weather.get_weather() ~= "thunder")) then
return false, S("You can only sleep at night or during a thunderstorm.") return false, S("You can only sleep at night or during a thunderstorm.")
end end
@ -253,8 +257,7 @@ end
function mcl_beds.sleep() function mcl_beds.sleep()
if weather_mod then if weather_mod then
if mcl_weather.get_weather() == "thunder" then if mcl_weather.get_weather() == "thunder" then
local tod = minetest.get_timeofday() * 24000 if mcl_beds.is_night() then
if (tod < 18541 and tod > 5458) then
mcl_beds.skip_night() mcl_beds.skip_night()
mcl_beds.kick_players() mcl_beds.kick_players()
else else