diff --git a/UHC-Core.iml b/UHC-Core.iml index 602c66c..c419cf3 100644 --- a/UHC-Core.iml +++ b/UHC-Core.iml @@ -4,6 +4,8 @@ + + diff --git a/src/net/mindoverflow/network/uhccore/commands/uhccommands/StartUhcCommand.java b/src/net/mindoverflow/network/uhccore/commands/uhccommands/StartUhcCommand.java index 6ff4b6b..f5eadfa 100644 --- a/src/net/mindoverflow/network/uhccore/commands/uhccommands/StartUhcCommand.java +++ b/src/net/mindoverflow/network/uhccore/commands/uhccommands/StartUhcCommand.java @@ -5,6 +5,7 @@ import net.mindoverflow.network.uhccore.utils.CommonValues; import net.mindoverflow.network.uhccore.utils.ConfigEntries; import net.mindoverflow.network.uhccore.utils.Debugger; import net.mindoverflow.network.uhccore.utils.FileUtils; +import net.mindoverflow.network.uhccore.utils.math.NumberUtils; import org.bukkit.*; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -47,9 +48,9 @@ public class StartUhcCommand { for(int i = 0; i < CommonValues.totalTeams; i++) { - double x = getRandomNumberInRange(borderX - range + 1, borderX + range - 1) + 0.5; - double z = getRandomNumberInRange(borderZ - range + 1, borderZ + range - 1) + 0.5; - int y = spawnWorld.getHighestBlockYAt((int) x, (int) z); + double x = NumberUtils.getRandomNumberInRange(borderX - range + 1, borderX + range - 1) + 0.5; + double z = NumberUtils.getRandomNumberInRange(borderZ - range + 1, borderZ + range - 1) + 0.5; + int y = spawnWorld.getHighestBlockYAt((int) x, (int) z); // todo: this method is shit, ushe the one i already implemented in Factions... Location loc = new Location(spawnWorld, x, y + 1, z); @@ -119,15 +120,4 @@ public class StartUhcCommand { }); } - - private static int getRandomNumberInRange(int min, int max) { - - if (min >= max) { - throw new IllegalArgumentException("max must be greater than min"); - } - - Random r = new Random(); - return r.nextInt((max - min) + 1) + min; - } - } diff --git a/src/net/mindoverflow/network/uhccore/utils/math/NumberUtils.java b/src/net/mindoverflow/network/uhccore/utils/math/NumberUtils.java new file mode 100644 index 0000000..cdeb9d0 --- /dev/null +++ b/src/net/mindoverflow/network/uhccore/utils/math/NumberUtils.java @@ -0,0 +1,16 @@ +package net.mindoverflow.network.uhccore.utils.math; + +import java.util.Random; + +public class NumberUtils { + + public static int getRandomNumberInRange(int min, int max) { + + if (min >= max) { + throw new IllegalArgumentException("max must be greater than min"); + } + + Random r = new Random(); + return r.nextInt((max - min) + 1) + min; + } +}