Skip to content

Commit 5fbe16e

Browse files
authored
Merge pull request #2949 from Multiverse/fix-regen-args
Fix regen args parsing logic
2 parents 26e5878 + 582d256 commit 5fbe16e

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/main/java/com/onarandombox/MultiverseCore/commands/RegenCommand.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,13 @@ public RegenCommand(MultiverseCore plugin) {
4040
@Override
4141
public void runCommand(CommandSender sender, List<String> args) {
4242
String worldName = args.get(0);
43-
boolean useseed = (!(args.size() == 1));
44-
boolean randomseed = (args.size() == 2 && args.get(1).equalsIgnoreCase("-s"));
45-
String seed = (args.size() == 3) ? args.get(2) : "";
43+
boolean useseed = CommandHandler.hasFlag("-s", args);
44+
String seedflag = CommandHandler.getFlag("-s", args);
4645
boolean keepGamerules = CommandHandler.hasFlag("--keep-gamerules", args);
46+
47+
boolean randomseed = seedflag == null || seedflag.isEmpty() || seedflag.equalsIgnoreCase("--keep-gamerules");
48+
String seed = randomseed ? "" : seedflag;
49+
4750
this.plugin.getCommandQueueManager().addToQueue(new QueuedCommand(
4851
sender,
4952
doWorldRegen(sender, worldName, useseed, randomseed, seed, keepGamerules),

0 commit comments

Comments
 (0)