Added hour:minute format to time command

* The time command now accepts parameters in the form <hour>:<minute>,
    and if invoked with no parameters returns the current time in said format.
This commit is contained in:
LeMagnesium 2015-05-16 14:54:53 +02:00 committed by Nils Dagsson Moskopp
parent d564d4d2b8
commit de7cd53f41
Signed by: erle
GPG Key ID: A3BC671C35191080
1 changed files with 34 additions and 12 deletions

View File

@ -318,7 +318,7 @@ core.register_chatcommand("teleport", {
teleportee:setpos(p) teleportee:setpos(p)
return true, "Teleporting to "..core.pos_to_string(p) return true, "Teleporting to "..core.pos_to_string(p)
end end
local teleportee = nil local teleportee = nil
local p = nil local p = nil
local target_name = nil local target_name = nil
@ -355,7 +355,7 @@ core.register_chatcommand("teleport", {
return true, "Teleporting " .. teleportee_name return true, "Teleporting " .. teleportee_name
.. " to " .. core.pos_to_string(p) .. " to " .. core.pos_to_string(p)
end end
local teleportee = nil local teleportee = nil
local p = nil local p = nil
local teleportee_name = nil local teleportee_name = nil
@ -377,7 +377,7 @@ core.register_chatcommand("teleport", {
.. " to " .. target_name .. " to " .. target_name
.. " at " .. core.pos_to_string(p) .. " at " .. core.pos_to_string(p)
end end
return false, 'Invalid parameters ("' .. param return false, 'Invalid parameters ("' .. param
.. '") or player not found (see /help teleport)' .. '") or player not found (see /help teleport)'
end, end,
@ -679,19 +679,41 @@ core.register_chatcommand("status", {
}) })
core.register_chatcommand("time", { core.register_chatcommand("time", {
params = "<0...24000>", params = "<0..23>:<0..59> | <0..24000>",
description = "set time of day", description = "set time of day",
privs = {settime=true}, privs = {},
func = function(name, param) func = function(name, param)
if param == "" then if param == "" then
return false, "Missing time." local current_time = math.floor(core.get_timeofday() * 1440)
local minutes = current_time % 60
local hour = (current_time - minutes) / 60
return true, ("Current time is %d:%02d"):format(hour, minutes)
end end
local newtime = tonumber(param) local player_privs = minetest.get_player_privs(name)
if newtime == nil then if not player_privs.settime then
return false, "Invalid time." return false, "You don't have permission to run this command " ..
"(missing privilege: settime)."
end end
core.set_timeofday((newtime % 24000) / 24000) local hour, minute = param:match("^(%d+):(%d+)$")
core.log("action", name .. " sets time " .. newtime) if not hour then
local new_time = tonumber(param)
if not new_time then
return false, "Invalid time."
end
-- Backward compatibility.
core.set_timeofday((new_time % 24000) / 24000)
core.log("action", name .. " sets time to " .. new_time)
return true, "Time of day changed."
end
hour = tonumber(hour)
minute = tonumber(minute)
if hour < 0 or hour > 23 then
return false, "Invalid hour (must be between 0 and 23 inclusive)."
elseif minute < 0 or minute > 59 then
return false, "Invalid minute (must be between 0 and 59 inclusive)."
end
core.set_timeofday((hour * 60 + minute) / 1440)
core.log("action", name .. " sets time to " .. hour .. ":" .. minute)
return true, "Time of day changed." return true, "Time of day changed."
end, end,
}) })
@ -808,4 +830,4 @@ core.register_chatcommand("last-login", {
end end
return false, "Last login time is unknown" return false, "Last login time is unknown"
end, end,
}) })