Merge remote-tracking branch 'origin/1.18' into 1.18
Dieser Commit ist enthalten in:
Commit
61f14b8f37
@ -134,6 +134,7 @@ public class Loader implements Listener {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
while (countdown <= 0) {
|
||||||
if (!iterator.hasNext()) {
|
if (!iterator.hasNext()) {
|
||||||
countdown = getTicksBetweenShots();
|
countdown = getTicksBetweenShots();
|
||||||
iterator = actions.listIterator();
|
iterator = actions.listIterator();
|
||||||
@ -149,6 +150,7 @@ public class Loader implements Listener {
|
|||||||
iterator.previous();
|
iterator.previous();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void undo() {
|
public void undo() {
|
||||||
if (actions.isEmpty() || stage != Stage.SETUP) {
|
if (actions.isEmpty() || stage != Stage.SETUP) {
|
||||||
|
@ -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;
|
||||||
}
|
}
|
||||||
|
In neuem Issue referenzieren
Einen Benutzer sperren