aboutsummaryrefslogtreecommitdiff
path: root/server/src/server.rs
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2025-06-03 20:00:18 +0200
committermetamuffin <metamuffin@disroot.org>2025-06-03 20:00:18 +0200
commitdb4587d3ec64b7e28691b43f9d9701939eed94d1 (patch)
tree1005017ea4a5d4e287024eaf08f876c7e34bfbdb /server/src/server.rs
parent9ee7eef2919feffe4e0695494d4027e8ec011808 (diff)
downloadhurrycurry-db4587d3ec64b7e28691b43f9d9701939eed94d1.tar
hurrycurry-db4587d3ec64b7e28691b43f9d9701939eed94d1.tar.bz2
hurrycurry-db4587d3ec64b7e28691b43f9d9701939eed94d1.tar.zst
update rust toolchain and rust dependencies.
`map_many_mut` and `trait_upcasting` was stabilized.
Diffstat (limited to 'server/src/server.rs')
-rw-r--r--server/src/server.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/server/src/server.rs b/server/src/server.rs
index f9342add..3823c0ca 100644
--- a/server/src/server.rs
+++ b/server/src/server.rs
@@ -531,7 +531,7 @@ impl Server {
return Err(tre!("s.error.self_interact"));
}
let [Some(other), Some(this)] =
- self.game.players.get_many_mut([&pid, &base_pid])
+ self.game.players.get_disjoint_mut([&pid, &base_pid])
else {
return Err(tre!("s.error.self_interact"));
};
@@ -677,7 +677,7 @@ impl Server {
.players_spatial_index
.query(pos1, 2., |p2, _pos2| {
if p1 != p2 {
- if let [Some(a), Some(b)] = self.game.players.get_many_mut([&p1, &p2]) {
+ if let [Some(a), Some(b)] = self.game.players.get_disjoint_mut([&p1, &p2]) {
a.movement.collide(&mut b.movement, dt)
}
}