diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/event/HellsBells.java b/FightSystem_Main/src/de/steamwar/fightsystem/event/HellsBells.java index 64faefa..e4b1767 100644 --- a/FightSystem_Main/src/de/steamwar/fightsystem/event/HellsBells.java +++ b/FightSystem_Main/src/de/steamwar/fightsystem/event/HellsBells.java @@ -97,19 +97,22 @@ public class HellsBells { public void startCountdown() { if (current != State.NONE) { long currentTime = System.currentTimeMillis(); - if (current != State.LAST && currentTime >= stateStart + (current.switchAfter * 1000L)) { - if (current != State.PRE) { - Bukkit.broadcastMessage(FightSystem.PREFIX + "§aDie Bomben fallen nun schneller."); - } + + + if (current != State.LAST && current != State.PRE && currentTime >= stateStart + (current.switchAfter * 1000L)) { + Bukkit.broadcastMessage(FightSystem.PREFIX + "§aDie Bomben fallen nun schneller."); current = current.getNext(); stateStart = currentTime; } int timer = current.minTime + random.nextInt(current.maxTime - current.minTime); + if (current == State.PRE) { Bukkit.broadcastMessage(FightSystem.PREFIX + (startMessages.get(random.nextInt(startMessages.size())))); + current = current.getNext(); } + currentCountdown = new HellsBellsCountdown(timer, SWSound.BLOCK_NOTE_BASS, true); currentCountdown.enable(); } @@ -212,7 +215,7 @@ public class HellsBells { private enum State { NONE(0, 0, -1), - PRE(60, 80, 50), + PRE(60, 80, 0), FIRST(40, 60, 5 * 60), SECOND(30, 40, 4 * 60), THIRD(20, 30, 3 * 60),