From 7dbb34febaf75572f99fee459a77cf917de05d8f Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Sat, 10 Aug 2024 20:57:06 +0200
Subject: Change protocol and server to allow multiple players per connection
 (untested)

---
 server/protocol/src/lib.rs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'server/protocol/src/lib.rs')

diff --git a/server/protocol/src/lib.rs b/server/protocol/src/lib.rs
index 02c6d0b1..a56b6edb 100644
--- a/server/protocol/src/lib.rs
+++ b/server/protocol/src/lib.rs
@@ -88,8 +88,11 @@ pub enum PacketS {
         name: String,
         character: i32,
     },
-    Leave,
+    Leave {
+        player: PlayerID,
+    },
     Movement {
+        player: PlayerID,
         #[bincode(with_serde)]
         direction: Vec2,
         boosting: bool,
@@ -97,15 +100,12 @@ pub enum PacketS {
         pos: Option<Vec2>,
     },
     Interact {
-        #[bincode(with_serde)]
-        pos: Option<IVec2>,
-    },
-    Collide {
         player: PlayerID,
         #[bincode(with_serde)]
-        force: Vec2,
+        pos: Option<IVec2>,
     },
     Communicate {
+        player: PlayerID,
         message: Option<Message>,
         persist: bool,
     },
@@ -114,6 +114,7 @@ pub enum PacketS {
     #[bincode(skip)]
     /// For internal use only
     ReplaceHand {
+        player: PlayerID,
         item: Option<ItemIndex>,
     },
     /// For use in replay sessions only
@@ -138,7 +139,7 @@ pub enum PacketC {
         major: u32,
         supports_bincode: bool,
     },
-    Init {
+    Joined {
         id: PlayerID,
     },
     Data {
-- 
cgit v1.2.3-70-g09d2