1 files changed, 31 insertions, 12 deletions
diff --git a/azalea-protocol/azalea-protocol-macros/src/lib.rs b/azalea-protocol/azalea-protocol-macros/src/lib.rs
index b7e85435..849a49e7 100755
--- a/azalea-protocol/azalea-protocol-macros/src/lib.rs
+++ b/azalea-protocol/azalea-protocol-macros/src/lib.rs
@@ -221,11 +221,19 @@ pub fn declare_state_packets(input: TokenStream) -> TokenStream {
         });
         serverbound_read_match_contents.extend(quote! {
             #id => {
-                let data = #module::#name::read(buf).map_err(|e| crate::read::ReadPacketError::Parse { source: e, packet_id: #id, packet_name: #name_litstr.to_string() })?;
-                let mut leftover = Vec::new();
-                let _ = std::io::Read::read_to_end(buf, &mut leftover);
-                if !leftover.is_empty() {
-                    return Err(crate::read::ReadPacketError::LeftoverData { packet_name: #name_litstr.to_string(), data: leftover });
+                let data = #module::#name::read(buf).map_err(|e| crate::read::ReadPacketError::Parse {
+                    source: e,
+                    packet_id: #id,
+                    backtrace: Box::new(std::backtrace::Backtrace::capture()),
+                    packet_name: #name_litstr.to_string(),
+                })?;
+                #[cfg(debug_assertions)]
+                {
+                    let mut leftover = Vec::new();
+                    let _ = std::io::Read::read_to_end(buf, &mut leftover);
+                    if !leftover.is_empty() {
+                        return Err(Box::new(crate::read::ReadPacketError::LeftoverData { packet_name: #name_litstr.to_string(), data: leftover }));
+                    }
                 }
                 data
             },
@@ -246,14 +254,25 @@ pub fn declare_state_packets(input: TokenStream) -> TokenStream {
         });
         clientbound_read_match_contents.extend(quote! {
             #id => {
-                let data = #module::#name::read(buf).map_err(|e| crate::read::ReadPacketError::Parse { source: e, packet_id: #id, packet_name: #name_litstr.to_string() })?;
+                let data = #module::#name::read(buf).map_err(|e| crate::read::ReadPacketError::Parse {
+                    source: e,
+                    packet_id: #id,
+                    backtrace: Box::new(std::backtrace::Backtrace::capture()),
+                    packet_name: #name_litstr.to_string(),
+                })?;
                 #[cfg(debug_assertions)]
                 {
                     let mut leftover = Vec::new();
                     let _ = std::io::Read::read_to_end(buf, &mut leftover);
                     if !leftover.is_empty() {
-                        return Err(crate::read::ReadPacketError::LeftoverData { packet_name: #name_litstr.to_string(), data: leftover });
-
+                        return Err(
+                            Box::new(
+                                crate::read::ReadPacketError::LeftoverData {
+                                    packet_name: #name_litstr.to_string(),
+                                    data: leftover
+                                }
+                            )
+                        );
                     }
                 }
                 data
@@ -314,13 +333,13 @@ pub fn declare_state_packets(input: TokenStream) -> TokenStream {
             fn read(
                 id: u32,
                 buf: &mut std::io::Cursor<&[u8]>,
-            ) -> Result<#serverbound_state_name, crate::read::ReadPacketError>
+            ) -> Result<#serverbound_state_name, Box<crate::read::ReadPacketError>>
             where
                 Self: Sized,
             {
                 Ok(match id {
                     #serverbound_read_match_contents
-                    _ => return Err(crate::read::ReadPacketError::UnknownPacketId { state_name: #state_name_litstr.to_string(), id }),
+                    _ => return Err(Box::new(crate::read::ReadPacketError::UnknownPacketId { state_name: #state_name_litstr.to_string(), id })),
                 })
             }
         }
@@ -345,13 +364,13 @@ pub fn declare_state_packets(input: TokenStream) -> TokenStream {
             fn read(
                 id: u32,
                 buf: &mut std::io::Cursor<&[u8]>,
-            ) -> Result<#clientbound_state_name, crate::read::ReadPacketError>
+            ) -> Result<#clientbound_state_name, Box<crate::read::ReadPacketError>>
             where
                 Self: Sized,
             {
                 Ok(match id {
                     #clientbound_read_match_contents
-                    _ => return Err(crate::read::ReadPacketError::UnknownPacketId { state_name: #state_name_litstr.to_string(), id }),
+                    _ => return Err(Box::new(crate::read::ReadPacketError::UnknownPacketId { state_name: #state_name_litstr.to_string(), id })),
                 })
             }
         }