diff --git a/src/main/java/com/alttd/ctf/config/GameConfig.java b/src/main/java/com/alttd/ctf/config/GameConfig.java index 1d933bf..d31caf2 100644 --- a/src/main/java/com/alttd/ctf/config/GameConfig.java +++ b/src/main/java/com/alttd/ctf/config/GameConfig.java @@ -86,7 +86,7 @@ public class GameConfig extends AbstractConfig { public static double y = 0; public static double z = 0; public static double CAPTURE_RADIUS = 5; - public static int WINNING_SCORE = 50; + public static int CAPTURE_SCORE = 50; @SuppressWarnings("unused") private static void load() { @@ -95,7 +95,7 @@ public class GameConfig extends AbstractConfig { y = config.getDouble(prefix, "y", y); z = config.getDouble(prefix, "z", z); CAPTURE_RADIUS = config.getDouble(prefix, "capture-radius", CAPTURE_RADIUS); - WINNING_SCORE = config.getInt(prefix, "winning-score", WINNING_SCORE); + CAPTURE_SCORE = config.getInt(prefix, "capture-score", CAPTURE_SCORE); } } diff --git a/src/main/java/com/alttd/ctf/flag/Flag.java b/src/main/java/com/alttd/ctf/flag/Flag.java index 7e90c6b..386ff09 100644 --- a/src/main/java/com/alttd/ctf/flag/Flag.java +++ b/src/main/java/com/alttd/ctf/flag/Flag.java @@ -188,7 +188,7 @@ public class Flag implements Runnable { if (max.isEmpty()) { return Optional.empty(); } - if (max.get().getValue() < GameConfig.FLAG.WINNING_SCORE) { + if (max.get().getValue() < GameConfig.FLAG.CAPTURE_SCORE) { return Optional.empty(); } return gameManager.getTeam(max.get().getKey()); @@ -282,7 +282,7 @@ public class Flag implements Runnable { bossBar.setTitle(String.format("Team %s is capturing the flag", PlainTextComponentSerializer.plainText().serialize(team.get().getName()))); lastWinningTeamId = highestKey; } - bossBar.setProgress(Math.min(GameConfig.FLAG.WINNING_SCORE, teamFlagPointCount.get(highestKey)) / (double) GameConfig.FLAG.WINNING_SCORE); + bossBar.setProgress(Math.min(GameConfig.FLAG.CAPTURE_SCORE, teamFlagPointCount.get(highestKey)) / (double) GameConfig.FLAG.CAPTURE_SCORE); bossBar.setVisible(teamFlagPointCount.get(highestKey) > 0); }