diff --git a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_19_4To1_19_3/ArmorToggleListener.java b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_19_4To1_19_3/ArmorToggleListener.java
index 4caaf573e..2fce7d40a 100644
--- a/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_19_4To1_19_3/ArmorToggleListener.java
+++ b/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_19_4To1_19_3/ArmorToggleListener.java
@@ -30,25 +30,38 @@ import org.bukkit.inventory.ItemStack;
 
 public final class ArmorToggleListener extends ViaBukkitListener {
 
-    public ArmorToggleListener(ViaVersionPlugin plugin) {
+    private static final boolean ENABLED = hasEquipmentSlot();
+
+    public ArmorToggleListener(final ViaVersionPlugin plugin) {
         super(plugin, Protocol1_19_4To1_19_3.class);
     }
 
+    private static boolean hasEquipmentSlot() {
+        // Doesn't exist on 1.8
+        try {
+            Material.class.getMethod("getEquipmentSlot");
+            return true;
+        } catch (final NoSuchMethodException e) {
+            return false;
+        }
+    }
+
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void itemUse(final PlayerInteractEvent event) {
-        final Player player = event.getPlayer();
-        if (!isOnPipe(player)) return;
-
-        final ItemStack item = event.getItem();
-        if (item == null) {
+        if (!ENABLED) {
             return;
         }
-        final EquipmentSlot equipmentSlot = item.getType().getEquipmentSlot();
-        // Name comparison for OFF_HAND so 1.8 doesn't complain
-        if (equipmentSlot != EquipmentSlot.HAND && !equipmentSlot.name().equals("OFF_HAND")) {
+
+        final Player player = event.getPlayer();
+        if (!isOnPipe(player) || event.getItem() == null) {
+            return;
+        }
+
+        final EquipmentSlot equipmentSlot = event.getItem().getType().getEquipmentSlot();
+        if (equipmentSlot != EquipmentSlot.HAND && equipmentSlot != EquipmentSlot.OFF_HAND) {
             final ItemStack armor = player.getInventory().getItem(equipmentSlot);
             // If two pieces of armor are equal, the client will do nothing.
-            if (armor != null && armor.getType() != Material.AIR && !armor.equals(item)) {
+            if (armor != null && armor.getType() != Material.AIR && !armor.equals(event.getItem())) {
                 player.updateInventory();
             }
         }
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/packets/EntityPackets.java
index 774ad5db7..190ea4ab1 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/packets/EntityPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/packets/EntityPackets.java
@@ -80,7 +80,7 @@ public final class EntityPackets extends EntityRewriter<ClientboundPackets1_19_3
                 map(Type.DOUBLE); // Z
                 map(Type.FLOAT); // Yaw
                 map(Type.FLOAT); // Pitch
-                map(Type.UNSIGNED_BYTE); // Relative arguments
+                map(Type.BYTE); // Relative arguments
                 map(Type.VAR_INT); // Id
                 read(Type.BOOLEAN); // Dismount vehicle
             }