Fix highest stat condition ending game prematurely

BattlePlugins · Jul 16, 2024 · f508f9d · f508f9d
1 parent bf86774
commit f508f9d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/plugin/src/main/java/org/battleplugins/arena/competition/victory/VictoryCondition.java b/plugin/src/main/java/org/battleplugins/arena/competition/victory/VictoryCondition.java
@@ -58,6 +58,8 @@ public final void advanceToNextPhase(Set<ArenaPlayer> victors) {
         CompetitionPhase<T> currentPhase = this.competition.getPhaseManager().getCurrentPhase();
         CompetitionPhaseType<T, CompetitionPhase<T>> nextPhase = currentPhase.getNextPhase();
 
+        this.competition.getArena().getPlugin().debug("Condition {} advancing to next phase: {}", this.getClass().getSimpleName(), nextPhase == null ? "NONE" : nextPhase.getName());
+
         // Ensure the next phase is a victory phase
         if (!CompetitionPhaseType.VICTORY.equals(nextPhase)) {
             this.competition.getArena().getPlugin().warn("Victory conditions for {} were met, but the next phase was not a victory phase. Not advancing onto the next phase!", this.getClass().getSimpleName());

diff --git a/...src/main/java/org/battleplugins/arena/competition/victory/types/HighestStatCondition.java b/...src/main/java/org/battleplugins/arena/competition/victory/types/HighestStatCondition.java
@@ -62,7 +62,7 @@ public void onStatChange(ArenaStatChangeEvent<Number> event) {
                     score += teamPlayer.stat(this.stat).orElse(0).intValue();
                 }
 
-                if (score >= this.winAfter) {
+                if (this.winAfter != -1 && score >= this.winAfter) {
                     this.advanceToNextPhase(players);
                 }
             }