Implements #42

src/main/java/net/knarcraft/minigames/command/dropper/DropperGroupSetCommand.java

@@ -5,6 +5,7 @@ import net.knarcraft.minigames.arena.dropper.DropperArena;
 import net.knarcraft.minigames.arena.dropper.DropperArenaGroup;
 import net.knarcraft.minigames.arena.dropper.DropperArenaHandler;
 import net.knarcraft.minigames.config.MiniGameMessage;
+import net.knarcraft.minigames.util.InputValidationHelper;
 import net.knarcraft.minigames.util.StringSanitizer;
 import net.knarcraft.minigames.util.TabCompleteHelper;
 import org.bukkit.command.Command;
@@ -46,7 +47,7 @@ public class DropperGroupSetCommand implements TabExecutor {
         }
 
         DropperArenaGroup arenaGroup;
-        if (groupName.equalsIgnoreCase("null") || groupName.equalsIgnoreCase("none")) {
+        if (InputValidationHelper.isEmptyValue(groupName)) {
             arenaGroup = null;
         } else {
             arenaGroup = arenaHandler.getGroup(groupName);

src/main/java/net/knarcraft/minigames/command/dropper/EditDropperArenaCommand.java

@@ -4,12 +4,10 @@ import net.knarcraft.knarlib.formatting.StringFormatter;
 import net.knarcraft.minigames.MiniGames;
 import net.knarcraft.minigames.arena.dropper.DropperArena;
 import net.knarcraft.minigames.arena.dropper.DropperArenaEditableProperty;
+import net.knarcraft.minigames.command.EditArenaCommand;
 import net.knarcraft.minigames.config.DropperConfiguration;
 import net.knarcraft.minigames.config.MiniGameMessage;
-import org.bukkit.Location;
-import org.bukkit.Material;
 import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -17,9 +15,7 @@ import org.jetbrains.annotations.NotNull;
 /**
  * The command for editing an existing dropper arena
  */
-public class EditDropperArenaCommand implements CommandExecutor {
-
-    private final DropperConfiguration configuration;
+public class EditDropperArenaCommand extends EditArenaCommand {
 
     /**
      * Instantiates a new edit arena command
@@ -27,7 +23,7 @@ public class EditDropperArenaCommand implements CommandExecutor {
      * @param configuration <p>The configuration to use</p>
      */
     public EditDropperArenaCommand(DropperConfiguration configuration) {
-        this.configuration = configuration;
+        super(configuration);
     }
 
     @Override
@@ -93,80 +89,8 @@ public class EditDropperArenaCommand implements CommandExecutor {
             case SPAWN_LOCATION -> arena.setSpawnLocation(parseLocation(player, value));
             case NAME -> arena.setName(value);
             case EXIT_LOCATION -> arena.setExitLocation(parseLocation(player, value));
+            case MAX_PLAYERS -> arena.setMaxPlayers(parseMaxPlayers(value));
         };
     }
 
-    /**
-     * Sanitizes the player's specified vertical velocity
-     *
-     * @param velocityString <p>The string to parse into a velocity</p>
-     * @return <p>The parsed velocity, defaulting to 0.5 if not parse-able</p>
-     */
-    private double sanitizeVerticalVelocity(@NotNull String velocityString) {
-        // Vertical velocity should not be negative, as it would make the player go upwards. There is technically not a
-        // max speed limit, but setting it too high makes the arena unplayable
-        double velocity;
-        try {
-            velocity = Double.parseDouble(velocityString);
-        } catch (NumberFormatException exception) {
-            velocity = configuration.getVerticalVelocity();
-        }
-
-        // Require at least speed of 0.001, and at most 75 blocks/s
-        return Math.min(Math.max(velocity, 0.001), 75);
-    }
-
-    /**
-     * Sanitizes the user's specified horizontal velocity
-     *
-     * @param velocityString <p>The string to parse into a velocity</p>
-     * @return <p>The parsed velocity, defaulting to 1 if not parse-able</p>
-     */
-    private float sanitizeHorizontalVelocity(@NotNull String velocityString) {
-        // Horizontal velocity is valid between -1 and 1, where negative values swaps directions
-        float velocity;
-        try {
-            velocity = Float.parseFloat(velocityString);
-        } catch (NumberFormatException exception) {
-            velocity = configuration.getHorizontalVelocity();
-        }
-
-        // If outside bonds, choose the most extreme value
-        return Math.min(Math.max(0.1f, velocity), 1);
-    }
-
-    /**
-     * Parses the given location string
-     *
-     * @param player         <p>The player changing a location</p>
-     * @param locationString <p>The location string to parse</p>
-     * @return <p>The parsed location, or the player's location if not parse-able</p>
-     */
-    private @NotNull Location parseLocation(Player player, String locationString) {
-        if ((locationString.trim() + ",").matches("([0-9]+.?[0-9]*,){3}")) {
-            String[] parts = locationString.split(",");
-            Location newLocation = player.getLocation().clone();
-            newLocation.setX(Double.parseDouble(parts[0].trim()));
-            newLocation.setY(Double.parseDouble(parts[1].trim()));
-            newLocation.setZ(Double.parseDouble(parts[2].trim()));
-            return newLocation;
-        } else {
-            return player.getLocation().clone();
-        }
-    }
-
-    /**
-     * Parses the given material name
-     *
-     * @param materialName <p>The material name to parse</p>
-     * @return <p>The parsed material, or AIR if not valid</p>
-     */
-    private @NotNull Material parseMaterial(String materialName) {
-        Material material = Material.matchMaterial(materialName);
-        if (material == null) {
-            material = Material.AIR;
-        }
-        return material;
-    }
-
 }

src/main/java/net/knarcraft/minigames/command/dropper/JoinDropperArenaCommand.java

@@ -60,6 +60,13 @@ public class JoinDropperArenaCommand implements CommandExecutor {
             return true;
         }
 
+        // Deny joining full arenas
+        int playingNow = MiniGames.getInstance().getDropperArenaPlayerRegistry().getPlayingPlayers(specifiedArena).size();
+        if (specifiedArena.getMaxPlayers() > 0 && playingNow >= specifiedArena.getMaxPlayers()) {
+            stringFormatter.displayErrorMessage(commandSender, MiniGameMessage.ERROR_JOIN_ARENA_FULL);
+            return true;
+        }
+
         joinArena(specifiedArena, player, arguments);
         return true;
     }