Merge remote-tracking branch 'origin/1.18' into 1.18
Dieser Commit ist enthalten in:
Commit
61f14b8f37
@ -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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
In neuem Issue referenzieren
Einen Benutzer sperren