stijn/HungerGames
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle empty stage list in Round and adjust state transitions in RoundService

Browse Source
This commit is contained in:
akastijn 2026-06-28 02:19:28 +02:00
parent 62c9661c82
commit a137ef4cc6
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/alttd/hunger_games/services/Round.java
View File

@ -119,6 +119,12 @@ public class Round {
private void scheduleNextStage(int index) { private void scheduleNextStage(int index) {
List<GameStage> gameStageList = Config.ROUND.STAGES; List<GameStage> gameStageList = Config.ROUND.STAGES;
if (gameStageList.isEmpty()) {
nextStage(); // Transition to SAFE_PHASE
nextStage(); // Transition to KILL_PHASE
return;
}
if (gameStageList.size() <= index) { if (gameStageList.size() <= index) {
nextStage(); nextStage();
return; return;
@ -128,10 +134,15 @@ public class Round {
Duration duration = gameStage.getDuration(); Duration duration = gameStage.getDuration();
startCountdown(duration, () -> { startCountdown(duration, () -> {
GameStageHandler.handleStageChange(gameStage.getWorldBorderSize());
if (gameStageList.size() <= index + 1) { if (gameStageList.size() <= index + 1) {
nextStage();
GameStageHandler.handleStageChange(gameStage.getWorldBorderSize());
startCountdown(Duration.ofMinutes(5), this::nextStage); startCountdown(Duration.ofMinutes(5), this::nextStage);
} else { } else {
if (index == 0 && roundState.equals(ROUND_STATE.SAFE_PHASE)) {
nextStage();
}
GameStageHandler.handleStageChange(gameStage.getWorldBorderSize());
scheduleNextStage(index + 1); scheduleNextStage(index + 1);
} }
}); });

2
src/main/java/com/alttd/hunger_games/services/RoundService.java
View File

@ -139,7 +139,7 @@ public class RoundService implements RoundListener {
if (roundState.equals(ROUND_STATE.FINALE)) { if (roundState.equals(ROUND_STATE.FINALE)) {
WorldBorderUtil.setSize(60); WorldBorderUtil.setSize(60);
} }
if (!roundState.equals(ROUND_STATE.ENDED)) { if (!roundState.equals(ROUND_STATE.ENDED) && !roundState.equals(ROUND_STATE.PLAYER_REGISTRATION)) {
Bukkit.broadcast(MiniMessage.miniMessage().deserialize(Messages.GAME.NEXT_STATE, Placeholder.parsed("round", roundState.getHumanReadableName()))); Bukkit.broadcast(MiniMessage.miniMessage().deserialize(Messages.GAME.NEXT_STATE, Placeholder.parsed("round", roundState.getHumanReadableName())));
} }
} }