aboutsummaryrefslogtreecommitdiff
path: root/server/src/game.rs
diff options
context:
space:
mode:
authornokoe <nokoe@mailbox.org>2024-06-27 12:50:54 +0200
committernokoe <nokoe@mailbox.org>2024-06-27 12:50:54 +0200
commit0ad1882a7a9023abb164c84630c7cd6fbbeb746f (patch)
tree1224b58658fb98d10ae1be9efc78554160230128 /server/src/game.rs
parentb0363cf5b56837b74308d4335d7f189f843ea770 (diff)
parentec6377cb004ae564a8ad2fd895f8aad09b0153c6 (diff)
downloadhurrycurry-0ad1882a7a9023abb164c84630c7cd6fbbeb746f.tar
hurrycurry-0ad1882a7a9023abb164c84630c7cd6fbbeb746f.tar.bz2
hurrycurry-0ad1882a7a9023abb164c84630c7cd6fbbeb746f.tar.zst
Merge branch 'master' of ssh://codeberg.org/metamuffin/undercooked
Diffstat (limited to 'server/src/game.rs')
-rw-r--r--server/src/game.rs13
1 files changed, 7 insertions, 6 deletions
diff --git a/server/src/game.rs b/server/src/game.rs
index ad777584..4cb5c450 100644
--- a/server/src/game.rs
+++ b/server/src/game.rs
@@ -202,17 +202,18 @@ impl Game {
pub fn packet_in(&mut self, player: PlayerID, packet: PacketS) -> Result<()> {
match packet {
PacketS::Join { name, character } => {
+ let position = if player.0 < 0 {
+ self.data.customer_spawn
+ } else {
+ self.data.chef_spawn
+ };
self.players.insert(
player,
Player {
item: None,
last_position_ts: Instant::now(),
character,
- position: if player.0 < 0 {
- self.data.customer_spawn
- } else {
- self.data.chef_spawn
- },
+ position,
communicate: None,
interacting: None,
name: name.clone(),
@@ -221,7 +222,7 @@ impl Game {
self.packet_out.push_back(PacketC::AddPlayer {
id: player,
name,
- position: self.data.chef_spawn,
+ position,
character,
});
}