hotfix for battle commanders assignment (#859)

Co-authored-by: Goosius1 <[email protected]>
TownyAdvanced · Jul 13, 2023 · 4163726 · 4163726
1 parent 516f932
commit 4163726
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.gmail.goosius</groupId>
   <artifactId>SiegeWar</artifactId>
-  <version>2.6.0</version>
+  <version>2.6.1</version>
   <name>siegewar</name> <!-- Leave lower-cased -->
 
   <properties>

diff --git a/src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarBattleCommanderUtil.java b/src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarBattleCommanderUtil.java
@@ -27,15 +27,18 @@ public static void assignBattleCommanders() {
         if(!SiegeWarSettings.isBattleCommandersEnabled()) {
             return;
         }
-        Player attackingCommander = null;
-        Player defendingCommander = null;
+        Player attackingCommander;
+        Player defendingCommander;
         String attackingCommanderName;
         String defendingCommanderName;
         for(Siege siege: SiegeController.getSieges()) {
             if(siege.getStatus().isActive()) {
                 //Wipe the current commanders
                 siege.setAttackingCommander(null);
                 siege.setDefendingCommander(null);
+                //Reset local vars
+                attackingCommander = null;
+                defendingCommander = null;
                 //Find the commanders for the siege
                 for(Player player: Bukkit.getOnlinePlayers()) {
                     if (SiegeWarDistanceUtil.isPlayerRegisteredToActiveSiegeZone(player)