From 70f0d5d9b4bafc816ddb6c45fb1be546bf33a439 Mon Sep 17 00:00:00 2001
From: jhqwqmc <2110242767@qq.com>
Date: Mon, 19 May 2025 13:12:35 +0800
Subject: [PATCH] =?UTF-8?q?fix(bukkit):=20=E4=BF=AE=E5=A4=8D=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/network/PacketConsumers.java       | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java
index 301b54540..63392db00 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java
@@ -1667,22 +1667,23 @@ public class PacketConsumers {
             boolean isChange = false;
             IntList intList = buf.readIntIdList();
             int first = intList.getFirst();
-            for (int i = 0, size = intList.size(); i < size; i++) {
-                int entityId = intList.getInt(i);
-                if (first != -114514) {
+            if (first != -114514) {
+                for (int i = 0, size = intList.size(); i < size; i++) {
+                    int entityId = intList.getInt(i);
                     EntityPacketHandler handler = user.entityPacketHandlers().remove(entityId);
                     if (handler != null && handler.handleEntitiesRemove(intList)) {
                         user.visualFurnitureView().removeByEntityId(entityId);
                         isChange = true;
                     }
-                } else {
-                    if (entityId == first) {
-                        intList.removeFirst();
-                        isChange = true;
-                    }
+                }
+            } else {
+                intList.removeFirst();
+                isChange = true;
+                for (int i = 0, size = intList.size(); i < size; i++) {
+                    int entityId = intList.getInt(i);
                     EntityPacketHandler handler = user.entityPacketHandlers().get(entityId);
-                    if (handler != null && handler.handleEntitiesRemove(intList)) {
-                        isChange = true;
+                    if (handler != null) {
+                        handler.handleEntitiesRemove(intList);
                     }
                 }
             }