fix(spigot): players not being unregistered if kicked during login

tritonmc · Jan 14, 2024 · 855629b · 855629b
1 parent 09d2690
commit 855629b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/triton-spigot/src/main/java/com/rexcantor64/triton/spigot/listeners/BukkitListener.java b/triton-spigot/src/main/java/com/rexcantor64/triton/spigot/listeners/BukkitListener.java
@@ -32,6 +32,8 @@ public void onLogin(AsyncPlayerPreLoginEvent loginEvent) {
                     .translateString(loginEvent.getKickMessage(), languagePlayer, Triton.get().getConfig().getKickSyntax())
                     .ifChanged(loginEvent::setKickMessage)
                     .ifUnchanged(() -> loginEvent.setKickMessage(""));
+            // Unregister the player, otherwise their language will stay (perhaps incorrectly) cached
+            SpigotTriton.asSpigot().getPlayerManager().unregisterPlayer(loginEvent.getUniqueId());
         }
     }
 
@@ -43,6 +45,8 @@ public void onLoginSync(PlayerLoginEvent loginEvent) {
                     .translateString(loginEvent.getKickMessage(), languagePlayer, Triton.get().getConfig().getKickSyntax())
                     .ifChanged(loginEvent::setKickMessage)
                     .ifUnchanged(() -> loginEvent.setKickMessage(""));
+            // Unregister the player, otherwise their language will stay (perhaps incorrectly) cached
+            SpigotTriton.asSpigot().getPlayerManager().unregisterPlayer(loginEvent.getPlayer().getUniqueId());
         }
     }