From 341d518e8a728204cb59f0cf5bd9017e59ad3fec Mon Sep 17 00:00:00 2001
From: aromaa <me@joniaromaa.fi>
Date: Tue, 7 Jan 2025 00:45:32 +0200
Subject: [PATCH] Fix when multiple tab list entries were filtered

Forgot the null check so we would leak the n-1 entries
---
 .../common/entity/player/tab/SpongeTabList.java        | 10 ++++++----
 1 file changed, 6 insertions(+), 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
index 3d92b8b235f..df318363459 100644
--- 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) {