From 5fd0dcae65d984781800c2b6bc3be25a9389d385 Mon Sep 17 00:00:00 2001
From: Lixfel <agga-games@gmx.de>
Date: Sat, 10 Dec 2022 12:38:07 +0100
Subject: [PATCH] Fix NPC removal in Tablist

Signed-off-by: Lixfel <agga-games@gmx.de>
---
 src/de/steamwar/bungeecore/tablist/Tablist.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/de/steamwar/bungeecore/tablist/Tablist.java b/src/de/steamwar/bungeecore/tablist/Tablist.java
index a1ba215..b34fbad 100644
--- a/src/de/steamwar/bungeecore/tablist/Tablist.java
+++ b/src/de/steamwar/bungeecore/tablist/Tablist.java
@@ -238,11 +238,15 @@ public class Tablist extends MessageToMessageDecoder<PacketWrapper> {
                         break;
                 }
             } else if(packet instanceof PlayerListItemRemove) {
+                List<String> names = new ArrayList<>();
                 for(UUID uuid : ((PlayerListItemRemove) packet).getUuids()) {
                     synchronized (directTabItems) {
-                        directTabItems.remove(uuid);
+                        PlayerListItem.Item directItem = directTabItems.remove(uuid);
+                        if(npcs.remove(uuid))
+                            names.add(directItem.getUsername());
                     }
                 }
+                sendNpcPacket(names, true);
             } else if(packet instanceof PlayerListItemUpdate) {
                 PlayerListItemUpdate list = (PlayerListItemUpdate) packet;
                 EnumSet<PlayerListItemUpdate.Action> actions = list.getActions();