Merge remote-tracking branch 'origin/1.18' into 1.18

BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java

@@ -134,19 +134,21 @@ public class Loader implements Listener {
             return;
         }
 
-        if (!iterator.hasNext()) {
+        while (countdown <= 0) {
-            countdown = getTicksBetweenShots();
+            if (!iterator.hasNext()) {
-            iterator = actions.listIterator();
+                countdown = getTicksBetweenShots();
-            return;
+                iterator = actions.listIterator();
-        }
+                return;
+            }
 
-        current = iterator.next();
+            current = iterator.next();
 
-        if (current.execute()) {
+            if (current.execute()) {
-            countdown = current.delay(this);
+                countdown = current.delay(this);
-        } else {
+            } else {
-            countdown = 1;
+                countdown = 1;
-            iterator.previous();
+                iterator.previous();
+            }
         }
     }
 

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;
         }