From 582d256f3805ebf4b3bf66a5b09dacfdfd2e9ac4 Mon Sep 17 00:00:00 2001 From: Ben Woo <30431861+benwoo1110@users.noreply.github.com> Date: Sat, 19 Aug 2023 12:06:42 +0800 Subject: [PATCH] Fix regen args parsing logic --- .../MultiverseCore/commands/RegenCommand.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java index 4efe7ad5..3c5baf84 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java @@ -40,10 +40,13 @@ public class RegenCommand extends MultiverseCommand { @Override public void runCommand(CommandSender sender, List args) { String worldName = args.get(0); - boolean useseed = (!(args.size() == 1)); - boolean randomseed = (args.size() == 2 && args.get(1).equalsIgnoreCase("-s")); - String seed = (args.size() == 3) ? args.get(2) : ""; + boolean useseed = CommandHandler.hasFlag("-s", args); + String seedflag = CommandHandler.getFlag("-s", args); boolean keepGamerules = CommandHandler.hasFlag("--keep-gamerules", args); + + boolean randomseed = seedflag == null || seedflag.isEmpty() || seedflag.equalsIgnoreCase("--keep-gamerules"); + String seed = randomseed ? "" : seedflag; + this.plugin.getCommandQueueManager().addToQueue(new QueuedCommand( sender, doWorldRegen(sender, worldName, useseed, randomseed, seed, keepGamerules),