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

Merge branch 'zesterer/monotonic-time' into 'master'

Browse Source 
Don't allow time to go backward

See merge request veloren/veloren!3833
This commit is contained in:
Joshua Barretto 2023-03-18 11:06:31 +00:00
commit d6fdc2637b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/lib.rs
View File

@ -39,7 +39,7 @@ use common::{
mounting::Rider,
outcome::Outcome,
recipe::{ComponentRecipeBook, RecipeBook},
resources::{GameMode, PlayerEntity, TimeOfDay},
resources::{GameMode, PlayerEntity, Time, TimeOfDay},
spiral::Spiral2d,
terrain::{
block::Block, map::MapConfig, neighbors, site::DungeonKindMeta, BiomeKind,
@ -2153,10 +2153,14 @@ impl Client {
return Err(Error::Other("Failed to find entity from uid.".into()));
}
},
ServerGeneral::TimeOfDay(time_of_day, calendar, time) => {
ServerGeneral::TimeOfDay(time_of_day, calendar, new_time) => {
self.target_time_of_day = Some(time_of_day);
*self.state.ecs_mut().write_resource() = calendar;
*self.state.ecs_mut().write_resource() = time;
let mut time = self.state.ecs_mut().write_resource::<Time>();
// Avoid side-eye from Einstein
if new_time.0 > time.0 {
*time = new_time;
}
},
ServerGeneral::EntitySync(entity_sync_package) => {
self.state