Merge remote-tracking branch 'origin/reorganization' into reorganization

Author: Stivais

server/src/network/client.rs

@@ -38,10 +38,12 @@ impl ClientHandler {
         Self { writer: tx, handle }
     }
 
+    #[inline(always)]
     pub fn send(&self, data: Bytes) -> Result<(), SendError<Bytes>> {
         self.writer.send(data)
     }
 
+    #[inline(always)]
     pub fn abort(self) {
         self.handle.abort();
     }

server/src/network/packets/packet_serialize.rs

@@ -200,8 +200,8 @@ impl PacketSerializable for FString {
     fn write_size(&self) -> usize {
         var_int_size(self.len() as i32) + self.len()
     }
-    
+
     fn write(&self, buf: &mut BytesMut) {
         self.as_str().write(buf);
     }
-}
+}

server/src/player/sidebar.rs

@@ -107,10 +107,10 @@ impl Sidebar {
 
                 if is_size_different {
                     packet_buffer.write_packet(&Teams {
-                        name: team.clone().into(),
-                        display_name: team.clone().into(),
-                        prefix: "".into(),
-                        suffix: "".into(),
+                        name: SizedString::truncated(&name),
+                        display_name: SizedString::truncated(&team),
+                        prefix: SizedString::EMPTY,
+                        suffix: SizedString::EMPTY,
                         name_tag_visibility: "always".into(),
                         color: 15,
                         players: vec![],
@@ -126,8 +126,8 @@ impl Sidebar {
                 }
 
                 packet_buffer.write_packet(&Teams {
-                    name: team.clone().into(),
-                    display_name: team.clone().into(),
+                    name: SizedString::truncated(&team),
+                    display_name: SizedString::truncated(&team),
                     prefix: first_half,
                     suffix: second_half,
                     name_tag_visibility: "always".into(),
@@ -139,10 +139,10 @@ impl Sidebar {
 
                 if is_size_different {
                     packet_buffer.write_packet(&Teams {
-                        name: team.clone().into(),
-                        display_name: team.into(),
-                        prefix: "".into(),
-                        suffix: "".into(),
+                        name: SizedString::truncated(&team),
+                        display_name: SizedString::truncated(&team),
+                        prefix: SizedString::EMPTY,
+                        suffix: SizedString::EMPTY,
                         name_tag_visibility: "always".into(),
                         color: -1,
                         players: vec![hide_name(&name)],