1 files changed, 11 insertions, 12 deletions
diff --git a/azalea-core/src/slot.rs b/azalea-core/src/slot.rs
index f1cd4f0b..4406e08d 100755
--- a/azalea-core/src/slot.rs
+++ b/azalea-core/src/slot.rs
@@ -1,6 +1,7 @@
 // TODO: have an azalea-inventory or azalea-container crate and put this there
 
 use azalea_buf::{BufReadError, McBuf, McBufReadable, McBufWritable};
+use azalea_nbt::Tag;
 use std::io::{Cursor, Write};
 
 #[derive(Debug, Clone, Default)]
@@ -13,29 +14,27 @@ pub enum Slot {
 #[derive(Debug, Clone, McBuf)]
 pub struct SlotData {
     #[var]
-    pub id: i32,
+    pub id: u32,
     pub count: u8,
-    pub nbt: azalea_nbt::Tag,
+    pub nbt: Tag,
 }
 
 impl McBufReadable for Slot {
     fn read_from(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> {
-        let present = bool::read_from(buf)?;
-        if !present {
-            return Ok(Slot::Empty);
-        }
-        let slot = SlotData::read_from(buf)?;
-        Ok(Slot::Present(slot))
+        let slot = Option::<SlotData>::read_from(buf)?;
+        Ok(slot.map_or(Slot::Empty, Slot::Present))
     }
 }
 
 impl McBufWritable for Slot {
     fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
         match self {
-            Slot::Empty => 0u8.write_into(buf)?,
-            Slot::Present(i) => i.write_into(buf)?,
-        }
-
+            Slot::Empty => false.write_into(buf)?,
+            Slot::Present(i) => {
+                true.write_into(buf)?;
+                i.write_into(buf)?;
+            }
+        };
         Ok(())
     }
 }