diff --git a/protocol/src/protocol/packet.rs b/protocol/src/protocol/packet.rs
index 0d29842..0455581 100644
--- a/protocol/src/protocol/packet.rs
+++ b/protocol/src/protocol/packet.rs
@@ -1668,7 +1668,12 @@ state_packets!(
             /// EntityEquipment is sent to display an item on an entity, like a sword
             /// or armor. Slot 0 is the held item and slots 1 to 4 are boots, leggings
             /// chestplate and helmet respectively.
-            packet EntityEquipment {
+            packet EntityEquipment_Slotless {
+                field entity_id: VarInt =,
+                field slot: VarInt =,
+                field item: Option<item::Stack> =,
+            }
+            packet EntityEquipment_VarInt {
                 field entity_id: VarInt =,
                 field slot: VarInt =,
                 field item: Option<item::Stack> =,
diff --git a/protocol/src/protocol/versions/v15w39c.rs b/protocol/src/protocol/versions/v15w39c.rs
index a5b16fc..a76c075 100644
--- a/protocol/src/protocol/versions/v15w39c.rs
+++ b/protocol/src/protocol/versions/v15w39c.rs
@@ -97,7 +97,7 @@ protocol_packet_ids!(
             0x39 => EntityMetadata
             0x3a => EntityAttach_leashed
             0x3b => EntityVelocity
-            0x3c => EntityEquipment
+            0x3c => EntityEquipment_VarInt
             0x3d => SetExperience
             0x3e => UpdateHealth
             0x3f => ScoreboardObjective
diff --git a/protocol/src/protocol/versions/v18w50a.rs b/protocol/src/protocol/versions/v18w50a.rs
index b83affc..2b1b6bc 100644
--- a/protocol/src/protocol/versions/v18w50a.rs
+++ b/protocol/src/protocol/versions/v18w50a.rs
@@ -120,7 +120,7 @@ protocol_packet_ids!(
             0x40 => EntityMetadata
             0x41 => EntityAttach
             0x42 => EntityVelocity
-            0x43 => EntityEquipment
+            0x43 => EntityEquipment_VarInt
             0x44 => SetExperience
             0x45 => UpdateHealth
             0x46 => ScoreboardObjective
diff --git a/protocol/src/protocol/versions/v19w02a.rs b/protocol/src/protocol/versions/v19w02a.rs
index 4800cde..47c3ea6 100644
--- a/protocol/src/protocol/versions/v19w02a.rs
+++ b/protocol/src/protocol/versions/v19w02a.rs
@@ -120,7 +120,7 @@ protocol_packet_ids!(
             0x40 => EntityMetadata
             0x41 => EntityAttach
             0x42 => EntityVelocity
-            0x43 => EntityEquipment
+            0x43 => EntityEquipment_VarInt
             0x44 => SetExperience
             0x45 => UpdateHealth
             0x46 => ScoreboardObjective
diff --git a/protocol/src/protocol/versions/v1_10_2.rs b/protocol/src/protocol/versions/v1_10_2.rs
index 3c62d10..160d3af 100644
--- a/protocol/src/protocol/versions/v1_10_2.rs
+++ b/protocol/src/protocol/versions/v1_10_2.rs
@@ -100,7 +100,7 @@ protocol_packet_ids!(
             0x39 => EntityMetadata
             0x3a => EntityAttach
             0x3b => EntityVelocity
-            0x3c => EntityEquipment
+            0x3c => EntityEquipment_VarInt
             0x3d => SetExperience
             0x3e => UpdateHealth
             0x3f => ScoreboardObjective
diff --git a/protocol/src/protocol/versions/v1_11_2.rs b/protocol/src/protocol/versions/v1_11_2.rs
index 70fb092..2a06c20 100644
--- a/protocol/src/protocol/versions/v1_11_2.rs
+++ b/protocol/src/protocol/versions/v1_11_2.rs
@@ -100,7 +100,7 @@ protocol_packet_ids!(
             0x39 => EntityMetadata
             0x3a => EntityAttach
             0x3b => EntityVelocity
-            0x3c => EntityEquipment
+            0x3c => EntityEquipment_VarInt
             0x3d => SetExperience
             0x3e => UpdateHealth
             0x3f => ScoreboardObjective
diff --git a/protocol/src/protocol/versions/v1_12_2.rs b/protocol/src/protocol/versions/v1_12_2.rs
index 334237f..27951a6 100644
--- a/protocol/src/protocol/versions/v1_12_2.rs
+++ b/protocol/src/protocol/versions/v1_12_2.rs
@@ -106,7 +106,7 @@ protocol_packet_ids!(
             0x3c => EntityMetadata
             0x3d => EntityAttach
             0x3e => EntityVelocity
-            0x3f => EntityEquipment
+            0x3f => EntityEquipment_VarInt
             0x40 => SetExperience
             0x41 => UpdateHealth
             0x42 => ScoreboardObjective
diff --git a/protocol/src/protocol/versions/v1_13_2.rs b/protocol/src/protocol/versions/v1_13_2.rs
index 027d80a..fc0a0b0 100644
--- a/protocol/src/protocol/versions/v1_13_2.rs
+++ b/protocol/src/protocol/versions/v1_13_2.rs
@@ -119,7 +119,7 @@ protocol_packet_ids!(
             0x3f => EntityMetadata
             0x40 => EntityAttach
             0x41 => EntityVelocity
-            0x42 => EntityEquipment
+            0x42 => EntityEquipment_VarInt
             0x43 => SetExperience
             0x44 => UpdateHealth
             0x45 => ScoreboardObjective
diff --git a/protocol/src/protocol/versions/v1_14.rs b/protocol/src/protocol/versions/v1_14.rs
index 47b204e..05a19bd 100644
--- a/protocol/src/protocol/versions/v1_14.rs
+++ b/protocol/src/protocol/versions/v1_14.rs
@@ -126,7 +126,7 @@ protocol_packet_ids!(
             0x43 => EntityMetadata
             0x44 => EntityAttach
             0x45 => EntityVelocity
-            0x46 => EntityEquipment
+            0x46 => EntityEquipment_VarInt
             0x47 => SetExperience
             0x48 => UpdateHealth
             0x49 => ScoreboardObjective
diff --git a/protocol/src/protocol/versions/v1_14_1.rs b/protocol/src/protocol/versions/v1_14_1.rs
index 47b204e..05a19bd 100644
--- a/protocol/src/protocol/versions/v1_14_1.rs
+++ b/protocol/src/protocol/versions/v1_14_1.rs
@@ -126,7 +126,7 @@ protocol_packet_ids!(
             0x43 => EntityMetadata
             0x44 => EntityAttach
             0x45 => EntityVelocity
-            0x46 => EntityEquipment
+            0x46 => EntityEquipment_VarInt
             0x47 => SetExperience
             0x48 => UpdateHealth
             0x49 => ScoreboardObjective
diff --git a/protocol/src/protocol/versions/v1_14_2.rs b/protocol/src/protocol/versions/v1_14_2.rs
index 47b204e..05a19bd 100644
--- a/protocol/src/protocol/versions/v1_14_2.rs
+++ b/protocol/src/protocol/versions/v1_14_2.rs
@@ -126,7 +126,7 @@ protocol_packet_ids!(
             0x43 => EntityMetadata
             0x44 => EntityAttach
             0x45 => EntityVelocity
-            0x46 => EntityEquipment
+            0x46 => EntityEquipment_VarInt
             0x47 => SetExperience
             0x48 => UpdateHealth
             0x49 => ScoreboardObjective
diff --git a/protocol/src/protocol/versions/v1_14_3.rs b/protocol/src/protocol/versions/v1_14_3.rs
index 67b9ed2..1aa8d92 100644
--- a/protocol/src/protocol/versions/v1_14_3.rs
+++ b/protocol/src/protocol/versions/v1_14_3.rs
@@ -126,7 +126,7 @@ protocol_packet_ids!(
             0x43 => EntityMetadata
             0x44 => EntityAttach
             0x45 => EntityVelocity
-            0x46 => EntityEquipment
+            0x46 => EntityEquipment_VarInt
             0x47 => SetExperience
             0x48 => UpdateHealth
             0x49 => ScoreboardObjective
diff --git a/protocol/src/protocol/versions/v1_14_4.rs b/protocol/src/protocol/versions/v1_14_4.rs
index 2ab71c7..f518c4c 100644
--- a/protocol/src/protocol/versions/v1_14_4.rs
+++ b/protocol/src/protocol/versions/v1_14_4.rs
@@ -126,7 +126,7 @@ protocol_packet_ids!(
             0x43 => EntityMetadata
             0x44 => EntityAttach
             0x45 => EntityVelocity
-            0x46 => EntityEquipment
+            0x46 => EntityEquipment_VarInt
             0x47 => SetExperience
             0x48 => UpdateHealth
             0x49 => ScoreboardObjective
diff --git a/protocol/src/protocol/versions/v1_15.rs b/protocol/src/protocol/versions/v1_15.rs
index 27c30b6..9ccc921 100644
--- a/protocol/src/protocol/versions/v1_15.rs
+++ b/protocol/src/protocol/versions/v1_15.rs
@@ -127,7 +127,7 @@ protocol_packet_ids!(
             0x44 => EntityMetadata
             0x45 => EntityAttach
             0x46 => EntityVelocity
-            0x47 => EntityEquipment
+            0x47 => EntityEquipment_VarInt
             0x48 => SetExperience
             0x49 => UpdateHealth
             0x4a => ScoreboardObjective
diff --git a/protocol/src/protocol/versions/v1_16_1.rs b/protocol/src/protocol/versions/v1_16_1.rs
index c9cb12f..dcf6448 100644
--- a/protocol/src/protocol/versions/v1_16_1.rs
+++ b/protocol/src/protocol/versions/v1_16_1.rs
@@ -128,7 +128,7 @@ protocol_packet_ids!(
             0x44 => EntityMetadata
             0x45 => EntityAttach
             0x46 => EntityVelocity
-            0x47 => EntityEquipment // TODO
+            0x47 => EntityEquipment_VarInt // TODO: changed to an array, but earlier than 1.16.1
             0x48 => SetExperience
             0x49 => UpdateHealth
             0x4a => ScoreboardObjective
diff --git a/protocol/src/protocol/versions/v1_9.rs b/protocol/src/protocol/versions/v1_9.rs
index 48b61fb..15e1ba9 100644
--- a/protocol/src/protocol/versions/v1_9.rs
+++ b/protocol/src/protocol/versions/v1_9.rs
@@ -100,7 +100,7 @@ protocol_packet_ids!(
             0x39 => EntityMetadata
             0x3a => EntityAttach
             0x3b => EntityVelocity
-            0x3c => EntityEquipment
+            0x3c => EntityEquipment_VarInt
             0x3d => SetExperience
             0x3e => UpdateHealth
             0x3f => ScoreboardObjective
diff --git a/protocol/src/protocol/versions/v1_9_2.rs b/protocol/src/protocol/versions/v1_9_2.rs
index cac5945..b987779 100644
--- a/protocol/src/protocol/versions/v1_9_2.rs
+++ b/protocol/src/protocol/versions/v1_9_2.rs
@@ -100,7 +100,7 @@ protocol_packet_ids!(
             0x39 => EntityMetadata
             0x3a => EntityAttach
             0x3b => EntityVelocity
-            0x3c => EntityEquipment
+            0x3c => EntityEquipment_VarInt
             0x3d => SetExperience
             0x3e => UpdateHealth
             0x3f => ScoreboardObjective