use PrefixedOptional instead in ChatMessagePacket

Author: radstevee

src/lib/net/crates/codec/src/decode/primitives.rs

@@ -145,38 +145,6 @@ where
     }
 }
 
-/// This implementation assumes that the optional was written using PacketByteBuf#writeNullable and has a leading bool.
-impl<T> NetDecode for Option<T>
-where
-    T: NetDecode,
-{
-    fn decode<R: Read>(reader: &mut R, opts: &NetDecodeOpts) -> Result<Self, NetDecodeError> {
-        let is_some = <bool as NetDecode>::decode(reader, opts)?;
-
-        if !is_some {
-            return Ok(None);
-        }
-
-        let value = <T as NetDecode>::decode(reader, opts)?;
-
-        Ok(Some(value))
-    }
-
-    async fn decode_async<R: AsyncRead + Unpin>(
-        reader: &mut R,
-        opts: &NetDecodeOpts,
-    ) -> Result<Self, NetDecodeError> {
-        let is_some = <bool as NetDecode>::decode_async(reader, opts).await?;
-        if !is_some {
-            return Ok(None);
-        }
-
-        let value = <T as NetDecode>::decode_async(reader, opts).await?;
-
-        Ok(Some(value))
-    }
-}
-
 /// This isn't actually a type in the Minecraft Protocol. This is just for saving data/ or for general use.
 /// It was created for saving/reading chunks!
 impl<K, V> NetDecode for HashMap<K, V>

src/lib/net/src/packets/incoming/chat_message.rs

@@ -1,14 +1,14 @@
 use ferrumc_macros::{packet, NetDecode};
-use ferrumc_net_codec::net_types::var_int::VarInt;
+use ferrumc_net_codec::net_types::{prefixed_optional::PrefixedOptional, var_int::VarInt};
 
-#[derive(NetDecode, Debug, Clone)]
+#[derive(NetDecode)]
 #[packet(packet_id = "chat", state = "play")]
 pub struct ChatMessagePacket {
     pub message: String,
     pub timestamp: u64,
     pub salt: u64,
     pub has_signature: bool,
-    pub signature: Option<Vec<u64>>,
+    pub signature: PrefixedOptional<Vec<u64>>,
     pub message_count: VarInt,
     pub acknowledged: Vec<u8>,
 }