Merge branch 'master' into 1.17
This commit is contained in:
commit
24e8c00998
40 files changed
+409
-124
No files matched your search
@@ -35,7 +35,7 @@ public class TickCommand
|
||||
executes((c) -> setTps(c.getSource(), getFloat(c, "rate"))))).
|
||||
then(literal("warp").
|
||||
executes( (c)-> setWarp(c.getSource(), 0, null)).
|
||||
then(argument("ticks", integer(0,4000000)).
|
||||
then(argument("ticks", integer(0)).
|
||||
suggests( (c, b) -> suggestMatching(new String[]{"3600","72000"},b)).
|
||||
executes((c) -> setWarp(c.getSource(), getInteger(c,"ticks"), null)).
|
||||
then(argument("tail command", greedyString()).
|
||||
@@ -143,4 +143,3 @@ public class TickCommand
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user