From 427aed9a7e60b12af55a06d59d83b02371d0b972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20M=C3=BCller?= Date: Sat, 21 Jun 2025 17:55:52 +0200 Subject: [PATCH] fixed bug in teamtasks --- .../eu/mhsl/craftattack/spawn/core/util/text/Countdown.java | 2 +- .../appliances/tooling/projectStart/ProjectStart.java | 1 - .../spawn/varo/appliances/internal/teamTasks/Task.java | 2 +- .../spawn/varo/appliances/internal/teamTasks/TeamTasks.java | 6 +++--- .../appliances/internal/teamTasks/tasks/BukkitTeamTask.java | 2 +- .../internal/teamTasks/tasks/CountdownTeamTask.java | 4 ++-- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/eu/mhsl/craftattack/spawn/core/util/text/Countdown.java b/core/src/main/java/eu/mhsl/craftattack/spawn/core/util/text/Countdown.java index 7ba6540..5241120 100644 --- a/core/src/main/java/eu/mhsl/craftattack/spawn/core/util/text/Countdown.java +++ b/core/src/main/java/eu/mhsl/craftattack/spawn/core/util/text/Countdown.java @@ -91,7 +91,7 @@ public class Countdown { } } - public boolean isDone() { + private boolean isDone() { return this.current <= 0; } diff --git a/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/projectStart/ProjectStart.java b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/projectStart/ProjectStart.java index e75d1ce..df6832a 100644 --- a/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/projectStart/ProjectStart.java +++ b/craftattack/src/main/java/eu/mhsl/craftattack/spawn/craftattack/appliances/tooling/projectStart/ProjectStart.java @@ -59,7 +59,6 @@ public class ProjectStart extends Appliance { private final Map, Boolean> gameRulesAfterStart = Map.ofEntries( entry(GameRule.DO_DAYLIGHT_CYCLE, true), entry(GameRule.DO_INSOMNIA, true), - entry(GameRule.ANNOUNCE_ADVANCEMENTS, true), entry(GameRule.DISABLE_RAIDS, false), entry(GameRule.DO_FIRE_TICK, true), entry(GameRule.DO_ENTITY_DROPS, true), diff --git a/varo/src/main/java/eu/mhsl/craftattack/spawn/varo/appliances/internal/teamTasks/Task.java b/varo/src/main/java/eu/mhsl/craftattack/spawn/varo/appliances/internal/teamTasks/Task.java index 2c6bfa8..7873eb7 100644 --- a/varo/src/main/java/eu/mhsl/craftattack/spawn/varo/appliances/internal/teamTasks/Task.java +++ b/varo/src/main/java/eu/mhsl/craftattack/spawn/varo/appliances/internal/teamTasks/Task.java @@ -2,5 +2,5 @@ package eu.mhsl.craftattack.spawn.varo.appliances.internal.teamTasks; public interface Task { void stopTask(); - boolean isRunning(); + boolean isTaskRunning(); } diff --git a/varo/src/main/java/eu/mhsl/craftattack/spawn/varo/appliances/internal/teamTasks/TeamTasks.java b/varo/src/main/java/eu/mhsl/craftattack/spawn/varo/appliances/internal/teamTasks/TeamTasks.java index 6364b05..c817b99 100644 --- a/varo/src/main/java/eu/mhsl/craftattack/spawn/varo/appliances/internal/teamTasks/TeamTasks.java +++ b/varo/src/main/java/eu/mhsl/craftattack/spawn/varo/appliances/internal/teamTasks/TeamTasks.java @@ -27,17 +27,17 @@ public class TeamTasks extends Appliance { public Map getRunningTeamTasks(VaroTeam team) { return this.getTeamTasks(team).entrySet().stream() - .filter(entry -> entry.getValue().isRunning()) + .filter(entry -> entry.getValue().isTaskRunning()) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); } public void cancelTeamTasks(VaroTeam team) { Main.logger().info(String.format("All TeamTasks for Team %s were cancelled: %s", team.name, this.getRunningTeamTasks(team))); - this.getTeamTasks(team).forEach((type, bukkitTask) -> bukkitTask.stopTask()); + this.getTeamTasks(team).forEach((type, task) -> task.stopTask()); } public void addTask(VaroTeam team, Type type, Task runnable) { - if(this.getTeamTasks(team).containsKey(type) && this.getTeamTasks(team).get(type).isRunning()) { + if(this.getTeamTasks(team).containsKey(type) && this.getTeamTasks(team).get(type).isTaskRunning()) { throw new IllegalStateException(String.format("Task %s for Team %s was already running!", type.name(), team.name)); } diff --git a/varo/src/main/java/eu/mhsl/craftattack/spawn/varo/appliances/internal/teamTasks/tasks/BukkitTeamTask.java b/varo/src/main/java/eu/mhsl/craftattack/spawn/varo/appliances/internal/teamTasks/tasks/BukkitTeamTask.java index 0d366ff..6ffbdf4 100644 --- a/varo/src/main/java/eu/mhsl/craftattack/spawn/varo/appliances/internal/teamTasks/tasks/BukkitTeamTask.java +++ b/varo/src/main/java/eu/mhsl/craftattack/spawn/varo/appliances/internal/teamTasks/tasks/BukkitTeamTask.java @@ -10,7 +10,7 @@ public abstract class BukkitTeamTask implements Task, BukkitTask { } @Override - public boolean isRunning() { + public boolean isTaskRunning() { return !this.isCancelled(); } } diff --git a/varo/src/main/java/eu/mhsl/craftattack/spawn/varo/appliances/internal/teamTasks/tasks/CountdownTeamTask.java b/varo/src/main/java/eu/mhsl/craftattack/spawn/varo/appliances/internal/teamTasks/tasks/CountdownTeamTask.java index 16ba024..0909ee7 100644 --- a/varo/src/main/java/eu/mhsl/craftattack/spawn/varo/appliances/internal/teamTasks/tasks/CountdownTeamTask.java +++ b/varo/src/main/java/eu/mhsl/craftattack/spawn/varo/appliances/internal/teamTasks/tasks/CountdownTeamTask.java @@ -18,7 +18,7 @@ public class CountdownTeamTask extends Countdown implements Task { } @Override - public boolean isRunning() { - return !super.isDone(); + public boolean isTaskRunning() { + return super.isRunning(); } }