From 605f56b895fa6833239eab4de0b798913866dbdc Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Sun, 4 Jul 2021 10:42:28 -0400
Subject: [PATCH] Update to 1.17.1-rc1

---
 connector/pom.xml                               |  2 +-
 ...r.java => JavaRemoveEntitiesTranslator.java} | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)
 rename connector/src/main/java/org/geysermc/connector/network/translators/java/entity/{JavaRemoveEntityTranslator.java => JavaRemoveEntitiesTranslator.java} (75%)

diff --git a/connector/pom.xml b/connector/pom.xml
index 149c74a7d..4541b4481 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -154,7 +154,7 @@
         <dependency>
             <groupId>com.github.steveice10</groupId>
             <artifactId>mcprotocollib</artifactId>
-            <version>1.17.1-pre1-SNAPSHOT</version>
+            <version>1.17.1-rc1-SNAPSHOT</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRemoveEntityTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRemoveEntitiesTranslator.java
similarity index 75%
rename from connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRemoveEntityTranslator.java
rename to connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRemoveEntitiesTranslator.java
index a891cb323..e05763ee1 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRemoveEntityTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaRemoveEntitiesTranslator.java
@@ -25,21 +25,22 @@
 
 package org.geysermc.connector.network.translators.java.entity;
 
-import com.github.steveice10.mc.protocol.packet.ingame.server.entity.ServerRemoveEntityPacket;
+import com.github.steveice10.mc.protocol.packet.ingame.server.entity.ServerRemoveEntitiesPacket;
 import org.geysermc.connector.entity.Entity;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.PacketTranslator;
 import org.geysermc.connector.network.translators.Translator;
 
-@Translator(packet = ServerRemoveEntityPacket.class)
-public class JavaRemoveEntityTranslator extends PacketTranslator<ServerRemoveEntityPacket> {
+@Translator(packet = ServerRemoveEntitiesPacket.class)
+public class JavaRemoveEntitiesTranslator extends PacketTranslator<ServerRemoveEntitiesPacket> {
 
     @Override
-    public void translate(ServerRemoveEntityPacket packet, GeyserSession session) {
-        Entity entity = session.getEntityCache().getEntityByJavaId(packet.getEntityId());
-
-        if (entity != null) {
-            session.getEntityCache().removeEntity(entity, false);
+    public void translate(ServerRemoveEntitiesPacket packet, GeyserSession session) {
+        for (int entityId : packet.getEntityIds()) {
+            Entity entity = session.getEntityCache().getEntityByJavaId(entityId);
+            if (entity != null) {
+                session.getEntityCache().removeEntity(entity, false);
+            }
         }
     }
 }