From 73f5d9bdf589d05a13729838c09590db7577bc0e Mon Sep 17 00:00:00 2001 From: yoyosource Date: Mon, 14 Mar 2022 18:40:35 +0100 Subject: [PATCH] Update Loader Signed-off-by: yoyosource --- .../bausystem/features/loader/Loader.java | 24 ++++++++++--------- .../features/loader/LoaderCommand.java | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java b/BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java index 01e81be5..06acdd01 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java @@ -134,19 +134,21 @@ public class Loader implements Listener { return; } - if (!iterator.hasNext()) { - countdown = getTicksBetweenShots(); - iterator = actions.listIterator(); - return; - } + while (countdown <= 0) { + if (!iterator.hasNext()) { + countdown = getTicksBetweenShots(); + iterator = actions.listIterator(); + return; + } - current = iterator.next(); + current = iterator.next(); - if (current.execute()) { - countdown = current.delay(this); - } else { - countdown = 1; - iterator.previous(); + if (current.execute()) { + countdown = current.delay(this); + } else { + countdown = 1; + iterator.previous(); + } } } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderCommand.java index 548e44c9..616385f4 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderCommand.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderCommand.java @@ -114,7 +114,7 @@ public class LoaderCommand extends SWCommand { @Register(value = "speed", description = "LOADER_HELP_SPEED") public void speedLoader(@Guard Player p, int delay) { - if (delay < 1) { + if (delay < 0) { BauSystem.MESSAGE.send("LOADER_SMALL_TIME", p); return; }