Use ACFUtil for random instance

Multiverse · Jan 24, 2025 · 8096a4e · 8096a4e
1 parent d3274cc
commit 8096a4e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/CreateCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/CreateCommand.java
@@ -3,6 +3,7 @@
 import java.util.Collections;
 import java.util.Random;
 
+import co.aikar.commands.ACFUtil;
 import co.aikar.commands.annotation.CommandAlias;
 import co.aikar.commands.annotation.CommandCompletion;
 import co.aikar.commands.annotation.CommandPermission;
@@ -41,11 +42,9 @@ final class CreateCommand extends CoreCommand {
     private final WorldManager worldManager;
     private GeneratorProvider generatorProvider;
 
-    private final Random random = new Random();
-
     private final CommandValueFlag<String> seedFlag = flag(CommandValueFlag.builder("--seed", String.class)
             .addAlias("-s")
-            .completion(input -> Collections.singleton(String.valueOf(random.nextLong())))
+            .completion(input -> Collections.singleton(String.valueOf(ACFUtil.RANDOM.nextLong())))
             .build());
 
     private final CommandValueFlag<String> generatorFlag = flag(CommandValueFlag

diff --git a/src/main/java/org/mvplugins/multiverse/core/commands/RegenCommand.java b/src/main/java/org/mvplugins/multiverse/core/commands/RegenCommand.java
@@ -2,8 +2,8 @@
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Random;
 
+import co.aikar.commands.ACFUtil;
 import co.aikar.commands.annotation.CommandAlias;
 import co.aikar.commands.annotation.CommandCompletion;
 import co.aikar.commands.annotation.CommandPermission;
@@ -41,11 +41,9 @@ final class RegenCommand extends CoreCommand {
     private final PlayerWorldTeleporter playerWorldTeleporter;
     private final WorldTickDeferrer worldTickDeferrer;
 
-    private final Random random = new Random();
-
     private final CommandValueFlag<String> seedFlag = flag(CommandValueFlag.builder("--seed", String.class)
             .addAlias("-s")
-            .completion(input -> Collections.singleton(String.valueOf(random.nextLong())))
+            .completion(input -> Collections.singleton(String.valueOf(ACFUtil.RANDOM.nextLong())))
             .optional()
             .build());
 

diff --git a/src/main/java/org/mvplugins/multiverse/core/world/options/CreateWorldOptions.java b/src/main/java/org/mvplugins/multiverse/core/world/options/CreateWorldOptions.java
@@ -2,6 +2,7 @@
 
 import java.util.Random;
 
+import co.aikar.commands.ACFUtil;
 import org.bukkit.World;
 import org.bukkit.WorldType;
 import org.bukkit.block.Biome;
@@ -39,7 +40,7 @@ public final class CreateWorldOptions {
      */
     CreateWorldOptions(@NotNull String worldName) {
         this.worldName = worldName;
-        this.seed = (new Random()).nextLong();
+        this.seed = ACFUtil.RANDOM.nextLong();
     }
 
     /**

diff --git a/src/main/java/org/mvplugins/multiverse/core/world/options/RegenWorldOptions.java b/src/main/java/org/mvplugins/multiverse/core/world/options/RegenWorldOptions.java
@@ -2,6 +2,7 @@
 
 import java.util.Random;
 
+import co.aikar.commands.ACFUtil;
 import org.bukkit.block.Biome;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -23,8 +24,6 @@ public final class RegenWorldOptions implements KeepWorldSettingsOptions {
         return new RegenWorldOptions(world);
     }
 
-    private final Random random = new Random();
-
     private final LoadedMultiverseWorld world;
     private Biome biome;
     private boolean keepGameRule = true;
@@ -197,7 +196,7 @@ public boolean randomSeed() {
      */
     public long seed() {
         if (randomSeed) {
-            return random.nextLong();
+            return ACFUtil.RANDOM.nextLong();
         } else if (seed == Long.MIN_VALUE) {
             return world.getSeed();
         }