From 25c2d30881ec2a0c7abf39be950db503303c2b03 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Thu, 2 Feb 2023 16:31:26 -0500
Subject: [PATCH] Remove players from player team map on team remove

---
 .../main/java/org/geysermc/geyser/scoreboard/Scoreboard.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/src/main/java/org/geysermc/geyser/scoreboard/Scoreboard.java b/core/src/main/java/org/geysermc/geyser/scoreboard/Scoreboard.java
index 56e1e67f8..f97693a62 100644
--- a/core/src/main/java/org/geysermc/geyser/scoreboard/Scoreboard.java
+++ b/core/src/main/java/org/geysermc/geyser/scoreboard/Scoreboard.java
@@ -351,6 +351,9 @@ public final class Scoreboard {
             // We need to use the direct entities list here, so #refreshSessionPlayerDisplays also updates accordingly
             // With the player's lack of a team in visibility checks
             updateEntityNames(remove, remove.getEntities(), true);
+            for (String name : remove.getEntities()) {
+                playerToTeam.remove(name, remove);
+            }
 
             session.removeCommandEnum("Geyser_Teams", remove.getId());
         }