aboutsummaryrefslogtreecommitdiff
path: root/server/game-core/src
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2025-10-30 14:41:33 +0100
committermetamuffin <metamuffin@disroot.org>2025-10-30 14:41:33 +0100
commit707a281d5310166300afa250ec041d9cc65f0068 (patch)
tree8c14b14a7c6b927e83e51d0f770e191b15a61001 /server/game-core/src
parentd238e7a3250791e43d1e26e009f5d56cfd200e08 (diff)
downloadhurrycurry-707a281d5310166300afa250ec041d9cc65f0068.tar
hurrycurry-707a281d5310166300afa250ec041d9cc65f0068.tar.bz2
hurrycurry-707a281d5310166300afa250ec041d9cc65f0068.tar.zst
Determine game end via score's time remaining. Remove end timestamp. fixes #493
Diffstat (limited to 'server/game-core/src')
-rw-r--r--server/game-core/src/lib.rs9
1 files changed, 4 insertions, 5 deletions
diff --git a/server/game-core/src/lib.rs b/server/game-core/src/lib.rs
index d4b7ed97..25f8600a 100644
--- a/server/game-core/src/lib.rs
+++ b/server/game-core/src/lib.rs
@@ -29,7 +29,6 @@ use spatial_index::SpatialIndex;
use std::{
collections::{BTreeSet, HashMap, HashSet, VecDeque},
sync::Arc,
- time::Instant,
};
#[derive(Debug, Clone, PartialEq)]
@@ -70,7 +69,6 @@ pub struct Game {
pub tiles: HashMap<IVec2, Tile>,
pub players: HashMap<PlayerID, Player>,
- pub end: Option<Instant>,
pub lobby: bool,
pub environment_effects: HashSet<String>,
pub score: Score,
@@ -198,9 +196,10 @@ impl Game {
self.tiles.remove(&pos);
self.walkable.remove(&pos);
if let Some(prev) = self.tiles.get(&pos)
- && let Some(set) = self.tile_index.get_mut(&prev.kind) {
- set.remove(&pos);
- }
+ && let Some(set) = self.tile_index.get_mut(&prev.kind)
+ {
+ set.remove(&pos);
+ }
if let Some(kind) = kind {
self.tiles.insert(pos, Tile { kind, item: None });
if !self.data_index.tile_collide[kind.0] {