Skip to content

As suggested, timer runs only on day change rather than every 5 minutes #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zoephix merged 2 commits into from
Feb 15, 2021
Merged

As suggested, timer runs only on day change rather than every 5 minutes #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd7616b
As suggested, timer runs only on day change rather than every 5 minutes
TovarischPootis Feb 15, 2021
febb183
Merge branch '1.2-wip' into 1.2-wip
TovarischPootis Feb 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gamemode/core/hooks/sv_hooks.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@ Issues with ULX/Ulib on your server will be ignored and we're
going to consider that you're taking the risk of ULX/Ulib's
critical performance issue.

Nutscript 1.1 only displays this message when you have ULX or
Nutscript 1.2 only displays this message when you have ULX or
ULib on your server.

-Nutscript Development Team
Expand Down
42 changes: 26 additions & 16 deletions gamemode/core/libs/sh_date.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
-- Module for date and time calculations

nut.date = nut.date or {}
nut.date.start = nut.date.start or os.time()

if (not nut.config) then
include("nutscript/gamemode/core/sh_config.lua")
Expand Down Expand Up @@ -57,6 +56,7 @@ if SERVER then
-- Checks the time difference between the old time values and current time, and updates month and day to advance in the time difference
-- creates a timer that updates the month and day values, in case the server runs continuously without restarts.
function nut.date.initialize()

-- Migrations
if (istable(nut.data.get("date", os.time(), true))) then
nut.data.set("date", os.time(), true, true)
Expand All @@ -74,20 +74,30 @@ if SERVER then
nut.config.set("month", tonumber(os.date("%m", configTime)))
nut.config.set("day", tonumber(os.date("%d", configTime)))

timer.Create("nutUpdateDate", 300, 0, function()
local configTime = os.time({
year = tonumber(os.date("%Y")),
month = tonumber(nut.config.get("month")),
day = tonumber(nut.config.get("day")),
hour = tonumber(os.date("%H")),
min = os.date("%M"),
sec = os.date("%S")
}) + os.difftime(os.time(), nut.date.start)

nut.config.set("month", tonumber(os.date("%m", configTime)))
nut.config.set("day", tonumber(os.date("%d", configTime)))
nut.date.start = os.time()
end)
-- internal function that calculates when the day ends, and updates the month/day when the next day comes.
-- the reason for this complication instead of just upvaluing day/month by 1 is that some months have 28, 30 or 31 days.
-- and its simpler for the server to decide what the next month should be rather than manually computing that
local function updateDateConfigs()
local curDateTable = os.date("*t") -- get the current date table
local remainingSeconds = (curDateTable.hour * -3600 - curDateTable.min * 60 - curDateTable.sec) % 86400 -- get the remaining seconds until the new day

timer.Simple(remainingSeconds, function() -- run this code only once the day changes
local newTime = os.time({
year = tonumber(os.date("%Y")),
month = tonumber(nut.config.get("month")),
day = tonumber(nut.config.get("day")),
hour = tonumber(os.date("%H")),
min = os.date("%M"),
sec = os.date("%S")
}) + 86400 -- 24 hours.

nut.config.set("month", tonumber(os.date("%m", newTime)))
nut.config.set("day", tonumber(os.date("%d", newTime)))
updateDateConfigs() -- create a new timer for the next day
end)
end

updateDateConfigs()
end

-- saves the current actual time. This allows the time to find the difference in elapsed time between server shutdown and startup
Expand All @@ -102,4 +112,4 @@ if SERVER then
hook.Add("SaveData", "nutDateSave", function()
nut.date.save()
end)
end
end