From 6cb2d7cd5cba4778dc58ddfba7f8a0b4b2c68bac Mon Sep 17 00:00:00 2001 From: MattBDev <4009945+MattBDev@users.noreply.github.com> Date: Fri, 3 Jan 2020 12:36:00 -0500 Subject: [PATCH] Stupid Piston --- .../worldedit/command/GenerationCommands.java | 22 +++++++++---------- .../worldedit/command/HistorySubCommands.java | 3 ++- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java index 77fe4b5c2..ad3b18034 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java @@ -94,17 +94,17 @@ public class GenerationCommands { @Logging(PLACEMENT) @Confirm(Confirm.Processor.REGION) public void caves(Actor actor, LocalSession session, EditSession editSession, @Selection Region region, - @Arg(name = "size", desc = "TODO", def = "8") int size, - @Arg(name = "frequency", desc = "TODO", def = "40") int frequency, - @Arg(name = "rarity", desc = "TODO", def = "7") int rarity, - @Arg(name = "minY", desc = "TODO", def = "8") int minY, - @Arg(name = "maxY", desc = "TODO", def = "127") int maxY, - @Arg(name = "systemFrequency", desc = "TODO", def = "1") int systemFrequency, - @Arg(name = "individualRarity", desc = "TODO", def = "25") int individualRarity, - @Arg(name = "pocketChance", desc = "TODO", def = "0") int pocketChance, - @Arg(name = "pocketMin", desc = "TODO", def = "0") int pocketMin, - @Arg(name = "pocketMax", desc = "TODO", def = "3") int pocketMax) throws WorldEditException { - CavesGen gen = new CavesGen(size, frequency, rarity, minY, maxY, systemFrequency, individualRarity, pocketChance, pocketMin, pocketMax); + @Arg(name = "size", desc = "TODO", def = "8") int sizeOpt, + @Arg(name = "frequency", desc = "TODO", def = "40") int frequencyOpt, + @Arg(name = "rarity", desc = "TODO", def = "7") int rarityOpt, + @Arg(name = "minY", desc = "TODO", def = "8") int minYOpt, + @Arg(name = "maxY", desc = "TODO", def = "127") int maxYOpt, + @Arg(name = "systemFrequency", desc = "TODO", def = "1") int systemFrequencyOpt, + @Arg(name = "individualRarity", desc = "TODO", def = "25") int individualRarityOpt, + @Arg(name = "pocketChance", desc = "TODO", def = "0") int pocketChanceOpt, + @Arg(name = "pocketMin", desc = "TODO", def = "0") int pocketMinOpt, + @Arg(name = "pocketMax", desc = "TODO", def = "3") int pocketMaxOpt) throws WorldEditException { + CavesGen gen = new CavesGen(sizeOpt, frequencyOpt, rarityOpt, minYOpt, maxYOpt, systemFrequencyOpt, individualRarityOpt, pocketChanceOpt, pocketMinOpt, pocketMaxOpt); editSession.generate(region, gen); actor.print(Caption.of("fawe.worldedit.visitor.visitor.block" , editSession.getBlockChangeCount())); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/HistorySubCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/HistorySubCommands.java index 284f66488..200b1d3ca 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/HistorySubCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/HistorySubCommands.java @@ -277,7 +277,8 @@ public class HistorySubCommands { @CommandPermissions("worldedit.history.find") public synchronized void find(Player player, World world, RollbackDatabase database, Arguments arguments, @ArgFlag(name = 'u', desc = "String user") UUID other, - @ArgFlag(name = 'r', def = "0", desc = "radius") int radius, + @ArgFlag(name = 'r', def = "0", desc = "radius") + @Range(from = 0, to = Integer.MAX_VALUE) int radius, @ArgFlag(name = 't', desc = "Time e.g. 20s", def = "0") @Time long timeDiff, @ArgFlag(name = 'p', desc = "Page to view.", def = "1") int page) throws WorldEditException {