Fix when multiple tab list entries were filtered

Forgot the null check so we would leak the n-1 entries
SpongePowered · Jan 6, 2025 · 341d518 · 341d518
1 parent cd61fe8
commit 341d518
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/main/java/org/spongepowered/common/entity/player/tab/SpongeTabList.java b/src/main/java/org/spongepowered/common/entity/player/tab/SpongeTabList.java
@@ -243,7 +243,7 @@ void sendUpdate(final TabListEntry entry, final EnumSet<ClientboundPlayerInfoUpd
                     ((SpongeTabListEntry) entry).updateWithoutSend();
                     entry.setListed(update.listed());
                 }
-            } else {
+            } else if (filteredEntries == null) {
                 if (packet.entries().size() == 1) {
                     return null;
                 }
@@ -263,13 +263,15 @@ void sendUpdate(final TabListEntry entry, final EnumSet<ClientboundPlayerInfoUpd
         for (int i = 0; i < packet.profileIds().size(); i++) {
             final UUID uniqueId = packet.profileIds().get(i);
             final TabListEntry entry = this.entries.remove(uniqueId);
-            if (entry == null) {
+            if (entry != null) {
+                if (filteredProfileIds != null) {
+                    filteredProfileIds.add(uniqueId);
+                }
+            } else if (filteredProfileIds == null) {
                 if (packet.profileIds().size() == 1) {
                     return null;
                 }
                 filteredProfileIds = new ArrayList<>(packet.profileIds().subList(0, i));
-            } else if (filteredProfileIds != null) {
-                filteredProfileIds.add(uniqueId);
             }
         }
         if (filteredProfileIds == null) {