From 2cbca9a791c119c2f709e7fe16f5d071e8c42078 Mon Sep 17 00:00:00 2001
From: Gegy <gegy.dev@gmail.com>
Date: Sun, 9 Jun 2024 14:35:56 +0200
Subject: [PATCH] Fix: add player to team after all relevant teams have been
 sent to that client

---
 .../xyz/nucleoid/plasmid/game/common/team/TeamManager.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/xyz/nucleoid/plasmid/game/common/team/TeamManager.java b/src/main/java/xyz/nucleoid/plasmid/game/common/team/TeamManager.java
index 5a3bebf7..dbd97830 100644
--- a/src/main/java/xyz/nucleoid/plasmid/game/common/team/TeamManager.java
+++ b/src/main/java/xyz/nucleoid/plasmid/game/common/team/TeamManager.java
@@ -306,13 +306,16 @@ private TeamManager.State teamState(GameTeamKey team) {
     }
 
     private void onAddPlayer(ServerPlayerEntity player) {
+        this.sendTeamsToPlayer(player);
+        this.restoreFormerTeams(player);
+    }
+
+    private void restoreFormerTeams(ServerPlayerEntity player) {
         var team = this.teamFor(player);
         if (team != null) {
             var state = this.teamState(team);
             this.addOnlinePlayer(player, state);
         }
-
-        this.sendTeamsToPlayer(player);
     }
 
     private void onRemovePlayer(ServerPlayerEntity player) {