Update removal logic

ldtteam · Nov 4, 2024 · 9dd5155 · 9dd5155
1 parent d6906d3
commit 9dd5155
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/com/minecolonies/api/entity/other/AbstractFastMinecoloniesEntity.java b/src/main/java/com/minecolonies/api/entity/other/AbstractFastMinecoloniesEntity.java
@@ -384,8 +384,11 @@ private boolean isInTeam(@NotNull final PlayerTeam team)
     public void remove(@NotNull final RemovalReason reason)
     {
         super.remove(reason);
-        // TODO: This causes a stackoverflow, how do we properly clean up team assignments?
-        //removeFromTeam();
+        final PlayerTeam playersTeam = level.getScoreboard().getPlayersTeam(getScoreboardName());
+        if (playersTeam != null)
+        {
+            level.getScoreboard().removePlayerFromTeam(getScoreboardName(), playersTeam);
+        }
     }
 
     /**