SteamWar/BauSystem2.0
Archiviert
12
0

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

Dieser Commit ist enthalten in:
Lixfel 2022-03-23 09:10:50 +01:00
Commit 61f14b8f37
2 geänderte Dateien mit 14 neuen und 12 gelöschten Zeilen

Datei anzeigen

@ -134,19 +134,21 @@ public class Loader implements Listener {
return; 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();
}
} }
} }

Datei anzeigen

@ -114,7 +114,7 @@ public class LoaderCommand extends SWCommand {
@Register(value = "speed", description = "LOADER_HELP_SPEED") @Register(value = "speed", description = "LOADER_HELP_SPEED")
public void speedLoader(@Guard Player p, int delay) { public void speedLoader(@Guard Player p, int delay) {
if (delay < 1) { if (delay < 0) {
BauSystem.MESSAGE.send("LOADER_SMALL_TIME", p); BauSystem.MESSAGE.send("LOADER_SMALL_TIME", p);
return; return;
} }