diff options
| author | metamuffin <metamuffin@disroot.org> | 2025-10-19 00:38:09 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2025-10-19 00:38:09 +0200 |
| commit | 62d918e5feeaf5b3add982a5baaffb201a1f2ece (patch) | |
| tree | b14a0fa01f9df692592bf5d16543f43b6eb933d6 /server/protocol | |
| parent | 6b156bea343a0fd9a043dcfe7113986855a89aab (diff) | |
| download | hurrycurry-62d918e5feeaf5b3add982a5baaffb201a1f2ece.tar hurrycurry-62d918e5feeaf5b3add982a5baaffb201a1f2ece.tar.bz2 hurrycurry-62d918e5feeaf5b3add982a5baaffb201a1f2ece.tar.zst | |
Implement interaction with other players through id instead of tile pos
Diffstat (limited to 'server/protocol')
| -rw-r--r-- | server/protocol/src/lib.rs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/server/protocol/src/lib.rs b/server/protocol/src/lib.rs index 82476eab..b686fcee 100644 --- a/server/protocol/src/lib.rs +++ b/server/protocol/src/lib.rs @@ -121,8 +121,7 @@ pub enum PacketS { Interact { player: PlayerID, hand: Hand, - #[serde(deserialize_with = "deser_ivec2_opt", default)] - pos: Option<IVec2>, + target: Option<ItemLocation>, }, Communicate { player: PlayerID, @@ -382,10 +381,6 @@ fn deser_usize<'de, D: Deserializer<'de>>(deserializer: D) -> Result<usize, D::E let x = f64::deserialize(deserializer)?; Ok(x.trunc() as usize) } -fn deser_ivec2_opt<'de, D: Deserializer<'de>>(deserializer: D) -> Result<Option<IVec2>, D::Error> { - let x = Option::<Vec2>::deserialize(deserializer)?; - Ok(x.map(|v| v.as_ivec2())) -} fn deser_tile_index_map<'de, D: Deserializer<'de>>( deserializer: D, ) -> Result<BTreeMap<TileIndex, HashSet<ItemIndex>>, D::Error> { |