Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX #1622, /time command will not allow time going backwards as rtsim cannot handle time regression, time given in seconds is treated as if it were seconds ahead of the next midnight

Browse Source
This commit is contained in:
pepsalt 2022-08-26 13:44:01 +01:00 committed by LunarEclipse
parent 0e476cd3df
commit 3e580138df
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/src/cmd.rs
View File

@ -955,8 +955,14 @@ fn handle_time(
Some("dusk") => {
next_cycle(NaiveTime::from_hms(17, 0, 0).num_seconds_from_midnight() as f64)
},
Some(n) => match n.parse() {
Ok(n) => n,
Some(n) => match n.parse::<f64>() {
Ok(n) => {
if n < 0.0{
return Err(format!("{:?} is invalid, cannot be negative.", n));
}
// Seconds from next midnight
next_cycle(0.0) + n
},
Err(_) => match NaiveTime::parse_from_str(n, "%H:%M") {
// Relative to current day
Ok(time) => next_cycle(time.num_seconds_from_midnight() as f64),
@ -966,8 +972,13 @@ fn handle_time(
.filter(|_| n.starts_with('u'))
.and_then(|n| n.trim_start_matches('u').parse::<u64>().ok())
{
// Absolute time (i.e: since in-game epoch)
Some(n) => n as f64,
// Absolute time (i.e. from world epoch)
Some(n) => {
if (n as f64) < time_in_seconds {
return Err(format!("{:?} is before the current time, time cannot go backwards.", n))
}
n as f64
},
None => {
return Err(format!("{:?} is not a valid time.", n));
},