From 6f2bf659a95419858418008a837fc1d18ae9170f Mon Sep 17 00:00:00 2001
From: DoctorMacc <toy.fighter1@gmail.com>
Date: Thu, 25 Jun 2020 21:53:51 -0400
Subject: [PATCH] Update JavaEntityEquipmentTranslator for Java 1.16

---
 .../entity/JavaEntityEquipmentTranslator.java | 49 ++++++++++---------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityEquipmentTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityEquipmentTranslator.java
index bdbb10335..96d4c8366 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityEquipmentTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityEquipmentTranslator.java
@@ -25,14 +25,14 @@
 
 package org.geysermc.connector.network.translators.java.entity;
 
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.Equipment;
+import com.github.steveice10.mc.protocol.packet.ingame.server.entity.ServerEntityEquipmentPacket;
+import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
 import org.geysermc.connector.entity.Entity;
 import org.geysermc.connector.entity.LivingEntity;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.PacketTranslator;
 import org.geysermc.connector.network.translators.Translator;
-
-import com.github.steveice10.mc.protocol.packet.ingame.server.entity.ServerEntityEquipmentPacket;
-import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
 import org.geysermc.connector.network.translators.item.ItemTranslator;
 
 @Translator(packet = ServerEntityEquipmentPacket.class)
@@ -55,28 +55,29 @@ public class JavaEntityEquipmentTranslator extends PacketTranslator<ServerEntity
         }
 
         LivingEntity livingEntity = (LivingEntity) entity;
-        ItemData item = ItemTranslator.translateToBedrock(session, packet.getItem());
-        switch (packet.getSlot()) {
-            case HELMET:
-                livingEntity.setHelmet(item);
-                break;
-            case CHESTPLATE:
-                livingEntity.setChestplate(item);
-                break;
-            case LEGGINGS:
-                livingEntity.setLeggings(item);
-                break;
-            case BOOTS:
-                livingEntity.setBoots(item);
-                break;
-            case MAIN_HAND:
-                livingEntity.setHand(item);
-                break;
-            case OFF_HAND:
-                livingEntity.setOffHand(item);
-                break;
+        for (Equipment equipment : packet.getEquipment()) {
+            ItemData item = ItemTranslator.translateToBedrock(session, equipment.getItem());
+            switch (equipment.getSlot()) {
+                case HELMET:
+                    livingEntity.setHelmet(item);
+                    break;
+                case CHESTPLATE:
+                    livingEntity.setChestplate(item);
+                    break;
+                case LEGGINGS:
+                    livingEntity.setLeggings(item);
+                    break;
+                case BOOTS:
+                    livingEntity.setBoots(item);
+                    break;
+                case MAIN_HAND:
+                    livingEntity.setHand(item);
+                    break;
+                case OFF_HAND:
+                    livingEntity.setOffHand(item);
+                    break;
+            }
         }
-
         livingEntity.updateEquipment(session);
     }
 }