aboutsummaryrefslogtreecommitdiff
path: root/server/src/server.rs
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2025-10-10 18:06:37 +0200
committermetamuffin <metamuffin@disroot.org>2025-10-10 18:06:37 +0200
commit3fe8ba7f1b9fa7e38fa03f55fd898c8ca2a0e996 (patch)
treec3913fce710a879e2375c60a2b78e0cad483de18 /server/src/server.rs
parentf78856e4cd4928c790748b883b7916585980b3dd (diff)
downloadhurrycurry-3fe8ba7f1b9fa7e38fa03f55fd898c8ca2a0e996.tar
hurrycurry-3fe8ba7f1b9fa7e38fa03f55fd898c8ca2a0e996.tar.bz2
hurrycurry-3fe8ba7f1b9fa7e38fa03f55fd898c8ca2a0e996.tar.zst
Update to newest rust; replace rand with std random
Diffstat (limited to 'server/src/server.rs')
-rw-r--r--server/src/server.rs18
1 files changed, 9 insertions, 9 deletions
diff --git a/server/src/server.rs b/server/src/server.rs
index 3f54fe38..48439b5f 100644
--- a/server/src/server.rs
+++ b/server/src/server.rs
@@ -16,23 +16,23 @@
*/
use crate::{
- entity::{construct_entity, Entities, EntityContext},
+ ConnectionID,
+ entity::{Entities, EntityContext, construct_entity},
interaction::{interact, tick_slot},
+ random_float,
scoreboard::ScoreboardStore,
- ConnectionID,
};
use anyhow::{Context, Result};
-use hurrycurry_client_lib::{gamedata_index::GamedataIndex, Game, Involvement, Item, Player, Tile};
-use hurrycurry_data::{index::DataIndex, Serverdata};
-use hurrycurry_locale::{tre, TrError};
+use hurrycurry_client_lib::{Game, Involvement, Item, Player, Tile, gamedata_index::GamedataIndex};
+use hurrycurry_data::{Serverdata, index::DataIndex};
+use hurrycurry_locale::{TrError, tre};
use hurrycurry_protocol::{
- glam::{IVec2, Vec2},
- movement::MovementBase,
Character, Gamedata, Hand, ItemLocation, Menu, MessageTimeout, PacketC, PacketS, PlayerClass,
PlayerID, Score, TileIndex,
+ glam::{IVec2, Vec2},
+ movement::MovementBase,
};
use log::{info, warn};
-use rand::random;
use std::{
collections::{HashMap, HashSet, VecDeque},
path::PathBuf,
@@ -277,7 +277,7 @@ impl GameServerExt for Game {
PlayerClass::Customer => serverdata.customer_spawn.unwrap_or(serverdata.chef_spawn),
PlayerClass::Bot | PlayerClass::Chef => serverdata.chef_spawn,
PlayerClass::Tram => Vec2::ZERO, // should always have custom location
- }) + (Vec2::new(random(), random()) - 0.5);
+ }) + (Vec2::new(random_float(), random_float()) - 0.5);
self.players.insert(
id,
Player {