From 58618a3991665a0738d8a8e7cdf0f3713b678317 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Tue, 11 Nov 2025 17:36:15 +0100
Subject: [PATCH] Fix FightTeam.removeLeader Fix FightTeam.setLeader

---
 .../src/de/steamwar/fightsystem/fight/FightTeam.java     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java
index 768a2851..891315b9 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java
@@ -335,6 +335,9 @@ public class FightTeam {
     }
 
     private void removeLeader() {
+        if (this.leader != null && !Config.GameModeConfig.Kits.PersonalKits) {
+            this.leader.setKit(Kit.getKitByName(Config.GameModeConfig.Kits.MemberDefault));
+        }
         this.leader = null;
         if(!players.isEmpty()) {
             setLeader(players.values().iterator().next(), false);
@@ -344,8 +347,12 @@ public class FightTeam {
     }
 
     public void setLeader(FightPlayer leader, boolean silent) {
-        if(this.leader != null)
+        if (this.leader != null) {
             this.leader.ifPlayer(memberKit::loadToPlayer);
+            if (!Config.GameModeConfig.Kits.PersonalKits) {
+                this.leader.setKit(Kit.getKitByName(Config.GameModeConfig.Kits.MemberDefault));
+            }
+        }
 
         leader.ifPlayer(PersonalKitCreator::closeIfInKitCreator);