README.md

@@ -99,9 +99,7 @@ This reward requires an argument which is the permission string you want to gran
 ###### Command
 
 The reward requires the command as an argument. Type the full command with spaces and everything, but omit the `/` at
-the beginning of the command. Use %player_name% or anything that matches the
+the beginning of the command.
-RegEx `[<%(\\[{]player[_\\-]?(name)?[>%)\\]}]` (\<player>. \<player-name>, %player_name%, {player}, etc.) as the
-placeholder for the rewarded player's name.
 
 ###### Item
 
@@ -213,17 +211,16 @@ These are all the options that can be changed for an arena.
 | winLocation     | The location players must reach to win the arena (see spawnLocation for valid values). If set, this overrides, and is used instead of, the win block type.                                    |
 | checkpointAdd   | Adds a new checkpoint to the arena's checkpoints (see spawnLocation for valid values).                                                                                                        |
 | checkpointClear | Clears all current checkpoints. Give any value to execute. If not given a value, current checkpoints are shown.                                                                               |
-| killPlaneBlocks | A comma-separated list of materials which will force a loss when stepped on. +WOOL and other [material tags](#notes-about-material-tags) are supported as well.                               |
+| killPlaneBlocks | A comma-separated list of materials which will force a loss on hit. +WOOL and other [material tags](#notes-about-material-tags) are supported as well.                                        |
-| obstacleBlocks  | A comma-separated list of materials which will force a loss when touched from any direction. +WOOL and other [material tags](#notes-about-material-tags) are supported as well.               |
 
 ## Configuration options
 
 ### Shared
 
-| Name                | Type             | Default | Description                                                                                                                                                                                                                       |
+| Name                              | Type                | Default                             | Description                                                                                                                                                                                                                       |
-|---------------------|------------------|---------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|-----------------------------------|---------------------|-------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| liquidHitBoxDepth   | -1 < decimal < 0 | -0.8    | This decides how far inside a non-solid block the player must go before detection triggers (-1, 0). The closer to -1 it is, the more accurate it will seem to the player, but the likelihood of not detecting the hit increases.  | 
+| liquidHitBoxDepth                 | -1 < decimal < 0    | -0.8                                | This decides how far inside a non-solid block the player must go before detection triggers (-1, 0). The closer to -1 it is, the more accurate it will seem to the player, but the likelihood of not detecting the hit increases.  | 
-| solidHitBoxDistance | 0 < decimal < 1  | 0.2     | This decides the distance the player must be from a block below them before a hit triggers (0, 1). If too low, the likelihood of detecting the hit decreases, but it won't look like the player hit the block without being near. |
+| solidHitBoxDistance               | 0 < decimal < 1     | 0.2                                 | This decides the distance the player must be from a block below them before a hit triggers (0, 1). If too low, the likelihood of detecting the hit decreases, but it won't look like the player hit the block without being near. |
 
 ### Dropper
 
@@ -249,7 +246,6 @@ These are all the options that can be changed for an arena.
 | mustDoGroupedInSequence           | true/false | true                                 | Whether grouped dropper arenas must be played in the correct sequence                                                                                                                                                                                      |
 | ignoreRecordsUntilGroupBeatenOnce | true/false | false                                | Whether records won't be registered unless the player has already beaten all arenas in a group. That means players are required to do a second play-through to register a record for a grouped arena.                                                      |
 | killPlaneBlocks                   | list       | [see this](#killplaneblocks-default) | The types of blocks compromising parkour arenas' kill planes. Add any materials you want to use for the "bottom" of your parkour arenas. +WOOL and other [material tags](#notes-about-material-tags) are supported.                                        |
-| obstacleBlocks                    | list       | [see this](#obstacleblocks-default)  | The types of blocks treated as obstacles in every direction. +WOOL and other [material tags](#notes-about-material-tags) are supported.                                                                                                                    |
 
 #### blockWhitelist default:
 
@@ -271,12 +267,6 @@ These are all the options that can be changed for an arena.
 - LAVA
 - MAGMA_BLOCK
 
-#### obstacleBlocks default:
-
-- END_ROD
-- LIGHTNING_ROD
-- CHAIN
-
 ## Record placeholders
 
 Player records can be displayed on a leaderboard by using PlaceholderAPI. If you want to display a sign-based

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>net.knarcraft</groupId>
     <artifactId>MiniGames</artifactId>
-    <version>1.2</version>
+    <version>1.0</version>
     <packaging>jar</packaging>
 
     <name>MiniGames</name>
@@ -105,6 +105,12 @@
             <version>24.0.1</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.9.2</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>

src/main/java/net/knarcraft/minigames/arena/AbstractArenaPlayerRegistry.java

@@ -104,7 +104,7 @@ public abstract class AbstractArenaPlayerRegistry<K extends Arena> implements Ar
         for (PlayerEntryState entryState : entryStates) {
             this.entryStates.put(entryState.getPlayerId(), entryState);
         }
-        if (!this.entryStates.isEmpty()) {
+        if (this.entryStates.size() > 0) {
             MiniGames.log(Level.WARNING, entryStates.size() + " un-exited sessions found. This happens if " +
                     "players leave in the middle of a game, or if the server crashes. MiniGames will do its best " +
                     "to fix the players' states.");

src/main/java/net/knarcraft/minigames/arena/EditablePropertyType.java

@@ -38,11 +38,6 @@ public enum EditablePropertyType {
     /**
      * The property is a comma-separated list of materials
      */
-    MATERIAL_LIST,
+    MATERIAL_LIST
-
-    /**
-     * The property is any double value
-     */
-    DOUBLE,
 
 }

src/main/java/net/knarcraft/minigames/arena/dropper/DropperArena.java

@@ -21,7 +21,6 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
-import java.util.logging.Level;
 
 import static net.knarcraft.minigames.util.InputValidationHelper.isInvalid;
 
@@ -168,13 +167,13 @@ public class DropperArena implements Arena {
     public void addReward(@NotNull RewardCondition rewardCondition, @NotNull Reward reward) {
         this.rewards.computeIfAbsent(rewardCondition, k -> new HashSet<>());
         this.rewards.get(rewardCondition).add(reward);
-        this.saveArena();
+        this.dropperArenaHandler.saveArenas();
     }
 
     @Override
     public void clearRewards(@NotNull RewardCondition rewardCondition) {
         this.rewards.remove(rewardCondition);
-        this.saveArena();
+        this.dropperArenaHandler.saveArenas();
     }
 
     @Override
@@ -268,7 +267,7 @@ public class DropperArena implements Arena {
             return false;
         } else {
             this.spawnLocation = newLocation;
-            this.saveArena();
+            this.dropperArenaHandler.saveArenas();
             return true;
         }
     }
@@ -284,7 +283,7 @@ public class DropperArena implements Arena {
             return false;
         } else {
             this.exitLocation = newLocation;
-            this.saveArena();
+            this.dropperArenaHandler.saveArenas();
             return true;
         }
     }
@@ -301,7 +300,7 @@ public class DropperArena implements Arena {
             this.arenaName = arenaName;
             // Update the arena lookup map to make sure the new name can be used immediately
             this.dropperArenaHandler.updateLookupName(oldName, this.getArenaNameSanitized());
-            this.saveArena();
+            this.dropperArenaHandler.saveArenas();
             return true;
         } else {
             return false;
@@ -321,7 +320,7 @@ public class DropperArena implements Arena {
             return false;
         } else {
             this.winBlockType = material;
-            this.saveArena();
+            this.dropperArenaHandler.saveArenas();
             return true;
         }
     }
@@ -339,7 +338,7 @@ public class DropperArena implements Arena {
             return false;
         } else {
             this.playerHorizontalVelocity = horizontalVelocity;
-            this.saveArena();
+            this.dropperArenaHandler.saveArenas();
             return true;
         }
     }
@@ -355,24 +354,11 @@ public class DropperArena implements Arena {
             return false;
         } else {
             this.playerVerticalVelocity = verticalVelocity;
-            this.saveArena();
+            this.dropperArenaHandler.saveArenas();
             return true;
         }
     }
 
-    /**
-     * Saves this arena to disk
-     */
-    public void saveArena() {
-        try {
-            DropperArenaStorageHelper.saveSingleDropperArena(this);
-        } catch (IOException exception) {
-            MiniGames.log(Level.SEVERE, "Unable to save arena! " +
-                    "Data loss can occur!");
-            MiniGames.log(Level.SEVERE, exception.getMessage());
-        }
-    }
-
     @Override
     public boolean equals(Object other) {
         if (!(other instanceof DropperArena otherArena)) {

src/main/java/net/knarcraft/minigames/arena/dropper/DropperArenaGameMode.java

@@ -34,11 +34,11 @@ public enum DropperArenaGameMode implements ConfigurationSerializable, ArenaGame
      * @param gameMode <p>The game-mode string to match</p>
      * @return <p>The specified arena game-mode</p>
      */
-    public static @NotNull DropperArenaGameMode matchGameMode(@NotNull String gameMode) {
+    public static @NotNull DropperArenaGameMode matchGamemode(@NotNull String gameMode) {
         String sanitized = gameMode.trim().toLowerCase();
         if (sanitized.matches("(invert(ed)?|inverse)")) {
             return DropperArenaGameMode.INVERTED;
-        } else if (sanitized.matches("rand(om)?_?(inverted)?")) {
+        } else if (sanitized.matches("rand(om)?")) {
             return DropperArenaGameMode.RANDOM_INVERTED;
         } else {
             return DropperArenaGameMode.DEFAULT;

src/main/java/net/knarcraft/minigames/arena/parkour/ParkourArena.java

@@ -23,7 +23,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
-import java.util.logging.Level;
 
 import static net.knarcraft.minigames.util.InputValidationHelper.isInvalid;
 
@@ -73,16 +72,6 @@ public class ParkourArena implements Arena {
      */
     private @Nullable Set<Material> killPlaneBlocks;
 
-    /**
-     * The names of the block types serving as obstacles for this arena
-     */
-    private @Nullable Set<String> obstacleBlockNames;
-
-    /**
-     * The block types serving as obstacles for this arena
-     */
-    private @Nullable Set<Material> obstacleBlocks;
-
     /**
      * The checkpoints for this arena. Entering a checkpoint overrides the player's spawn location.
      */
@@ -106,8 +95,7 @@ public class ParkourArena implements Arena {
      * @param exitLocation        <p>The location the players are teleported to when exiting the arena, or null</p>
      * @param winBlockType        <p>The material of the block players have to hit to win this parkour arena</p>
      * @param winLocation         <p>The location a player has to reach to win this arena</p>
-     * @param killPlaneBlockNames <p>The names of the types of blocks that trigger a loss when stepped on</p>
+     * @param killPlaneBlockNames <p>The names of the type of blocks</p>
-     * @param obstacleBlockNames  <p>The names of the types of blocks that trigger a loss when touched</p>
      * @param checkpoints         <p>The checkpoints set for this arena</p>
      * @param rewards             <p>The rewards given by this arena</p>
      * @param parkourArenaData    <p>The arena data keeping track of which players have done what in this arena</p>
@@ -115,8 +103,7 @@ public class ParkourArena implements Arena {
      */
     public ParkourArena(@NotNull UUID arenaId, @NotNull String arenaName, @NotNull Location spawnLocation,
                         @Nullable Location exitLocation, @NotNull Material winBlockType, @Nullable Location winLocation,
-                        @Nullable Set<String> killPlaneBlockNames, @Nullable Set<String> obstacleBlockNames,
+                        @Nullable Set<String> killPlaneBlockNames, @NotNull List<Location> checkpoints,
-                        @NotNull List<Location> checkpoints,
                         @NotNull Map<RewardCondition, Set<Reward>> rewards,
                         @NotNull ParkourArenaData parkourArenaData, @NotNull ParkourArenaHandler arenaHandler) {
         this.arenaId = arenaId;
@@ -128,9 +115,6 @@ public class ParkourArena implements Arena {
         this.killPlaneBlockNames = killPlaneBlockNames;
         this.killPlaneBlocks = this.killPlaneBlockNames == null ? null : MaterialHelper.loadMaterialList(
                 new ArrayList<>(killPlaneBlockNames), "+", MiniGames.getInstance().getLogger());
-        this.obstacleBlockNames = obstacleBlockNames;
-        this.obstacleBlocks = this.obstacleBlockNames == null ? null : MaterialHelper.loadMaterialList(
-                new ArrayList<>(obstacleBlockNames), "+", MiniGames.getInstance().getLogger());
         this.checkpoints = checkpoints;
         this.parkourArenaData = parkourArenaData;
         this.parkourArenaHandler = arenaHandler;
@@ -163,7 +147,6 @@ public class ParkourArena implements Arena {
         this.parkourArenaData = new ParkourArenaData(this.arenaId, recordRegistries, new HashMap<>());
         this.winBlockType = Material.EMERALD_BLOCK;
         this.killPlaneBlocks = null;
-        this.obstacleBlocks = null;
         this.checkpoints = new ArrayList<>();
         this.parkourArenaHandler = arenaHandler;
     }
@@ -197,13 +180,13 @@ public class ParkourArena implements Arena {
     public void addReward(@NotNull RewardCondition rewardCondition, @NotNull Reward reward) {
         this.rewards.computeIfAbsent(rewardCondition, k -> new HashSet<>());
         this.rewards.get(rewardCondition).add(reward);
-        this.saveArena();
+        this.parkourArenaHandler.saveArenas();
     }
 
     @Override
     public void clearRewards(@NotNull RewardCondition rewardCondition) {
         this.rewards.remove(rewardCondition);
-        this.saveArena();
+        this.parkourArenaHandler.saveArenas();
     }
 
     @Override
@@ -257,28 +240,6 @@ public class ParkourArena implements Arena {
         return this.killPlaneBlockNames;
     }
 
-    /**
-     * Gets the block types used for this parkour arena's obstacle blocks
-     *
-     * @return <p>The types of blocks used as obstacles</p>
-     */
-    public @NotNull Set<Material> getObstacleBlocks() {
-        if (this.obstacleBlocks != null) {
-            return new HashSet<>(this.obstacleBlocks);
-        } else {
-            return MiniGames.getInstance().getParkourConfiguration().getObstacleBlocks();
-        }
-    }
-
-    /**
-     * Gets the names of the blocks used as this arena's obstacle blocks
-     *
-     * @return <p>The names of the blocks used as this arena's obstacle blocks</p>
-     */
-    public @Nullable Set<String> getObstacleBlockNames() {
-        return this.obstacleBlockNames;
-    }
-
     /**
      * Gets all checkpoint locations for this arena
      *
@@ -333,7 +294,7 @@ public class ParkourArena implements Arena {
 
     @Override
     public boolean willCauseLoss(Block block) {
-        return this.getKillPlaneBlocks().contains(block.getType()) || this.getObstacleBlocks().contains(block.getType());
+        return this.getKillPlaneBlocks().contains(block.getType());
     }
 
     @Override
@@ -353,7 +314,7 @@ public class ParkourArena implements Arena {
             return false;
         } else {
             this.spawnLocation = newLocation;
-            this.saveArena();
+            this.parkourArenaHandler.saveArenas();
             return true;
         }
     }
@@ -369,7 +330,7 @@ public class ParkourArena implements Arena {
             return false;
         } else {
             this.exitLocation = newLocation;
-            this.saveArena();
+            this.parkourArenaHandler.saveArenas();
             return true;
         }
     }
@@ -386,7 +347,7 @@ public class ParkourArena implements Arena {
             this.arenaName = arenaName;
             // Update the arena lookup map to make sure the new name can be used immediately
             this.parkourArenaHandler.updateLookupName(oldName, this.getArenaNameSanitized());
-            this.saveArena();
+            this.parkourArenaHandler.saveArenas();
             return true;
         } else {
             return false;
@@ -406,7 +367,7 @@ public class ParkourArena implements Arena {
             return false;
         } else {
             this.winBlockType = material;
-            this.saveArena();
+            this.parkourArenaHandler.saveArenas();
             return true;
         }
     }
@@ -422,7 +383,7 @@ public class ParkourArena implements Arena {
             return false;
         } else {
             this.winLocation = newLocation.clone();
-            this.saveArena();
+            this.parkourArenaHandler.saveArenas();
             return true;
         }
     }
@@ -434,7 +395,6 @@ public class ParkourArena implements Arena {
      */
     public boolean setKillPlaneBlocks(@NotNull Set<String> killPlaneBlockNames) {
         if (killPlaneBlockNames.isEmpty()) {
-            this.killPlaneBlockNames = null;
             this.killPlaneBlocks = null;
         } else {
             Set<Material> parsed = MaterialHelper.loadMaterialList(new ArrayList<>(killPlaneBlockNames), "+",
@@ -442,32 +402,9 @@ public class ParkourArena implements Arena {
             if (parsed.isEmpty()) {
                 return false;
             }
-            this.killPlaneBlockNames = killPlaneBlockNames;
             this.killPlaneBlocks = parsed;
         }
-        this.saveArena();
+        this.parkourArenaHandler.saveArenas();
-        return true;
-    }
-
-    /**
-     * Sets the type of blocks used as obstacle blocks
-     *
-     * @param obstacleBlockNames <p>The names of the obstacle blocks</p>
-     */
-    public boolean setObstacleBlocks(@NotNull Set<String> obstacleBlockNames) {
-        if (obstacleBlockNames.isEmpty()) {
-            this.obstacleBlockNames = null;
-            this.obstacleBlocks = null;
-        } else {
-            Set<Material> parsed = MaterialHelper.loadMaterialList(new ArrayList<>(obstacleBlockNames), "+",
-                    MiniGames.getInstance().getLogger());
-            if (parsed.isEmpty()) {
-                return false;
-            }
-            this.obstacleBlockNames = obstacleBlockNames;
-            this.obstacleBlocks = parsed;
-        }
-        this.saveArena();
         return true;
     }
 
@@ -483,7 +420,7 @@ public class ParkourArena implements Arena {
         }
 
         this.checkpoints.add(checkpoint.clone());
-        this.saveArena();
+        this.parkourArenaHandler.saveArenas();
         return true;
     }
 
@@ -498,23 +435,10 @@ public class ParkourArena implements Arena {
         }
 
         this.checkpoints.clear();
-        this.saveArena();
+        this.parkourArenaHandler.saveArenas();
         return true;
     }
 
-    /**
-     * Saves this arena to disk
-     */
-    public void saveArena() {
-        try {
-            ParkourArenaStorageHelper.saveSingleParkourArena(this);
-        } catch (IOException exception) {
-            MiniGames.log(Level.SEVERE, "Unable to save arena! " +
-                    "Data loss can occur!");
-            MiniGames.log(Level.SEVERE, exception.getMessage());
-        }
-    }
-
     @Override
     public boolean equals(Object other) {
         if (!(other instanceof ParkourArena otherArena)) {

src/main/java/net/knarcraft/minigames/arena/parkour/ParkourArenaEditableProperty.java

@@ -62,13 +62,6 @@ public enum ParkourArenaEditableProperty {
      */
     KILL_PLANE_BLOCKS("killPlaneBlocks", (arena) -> String.valueOf(arena.getKillPlaneBlockNames()),
             EditablePropertyType.MATERIAL_LIST),
-
-    /**
-     * The blocks used as this arena's obstacle blocks
-     */
-    OBSTACLE_BLOCKS("obstacleBlocks", (arena) -> String.valueOf(arena.getObstacleBlockNames()),
-            EditablePropertyType.MATERIAL_LIST),
-
     ;
 
     private final @NotNull String argumentString;

src/main/java/net/knarcraft/minigames/arena/parkour/ParkourArenaStorageKey.java

@@ -42,11 +42,6 @@ public enum ParkourArenaStorageKey {
      */
     KILL_PLANE_BLOCKS("killPlaneBlocks"),
 
-    /**
-     * The key for this arena's obstacle blocks (overrides the config)
-     */
-    OBSTACLE_BLOCKS("obstacleBlocks"),
-
     /**
      * The key for this arena's checkpoint locations
      */

src/main/java/net/knarcraft/minigames/arena/record/ArenaRecord.java

@@ -44,13 +44,6 @@ public abstract class ArenaRecord<K extends Comparable<K>> implements Comparable
         return record;
     }
 
-    /**
-     * Gets this as a string that should be printed on a sign
-     *
-     * @return <p>This as a string</p>
-     */
-    public abstract String getAsString();
-
     @Override
     public boolean equals(Object other) {
         return other instanceof ArenaRecord<?> && userId.equals(((ArenaRecord<?>) other).userId);
@@ -77,7 +70,7 @@ public abstract class ArenaRecord<K extends Comparable<K>> implements Comparable
 
     @Override
     public String toString() {
-        return userId + ":" + record;
+        return userId + ": " + record;
     }
 
 }

src/main/java/net/knarcraft/minigames/arena/record/IntegerRecord.java

@@ -19,11 +19,6 @@ public class IntegerRecord extends SummableArenaRecord<Integer> {
         super(userId, record);
     }
 
-    @Override
-    public String getAsString() {
-        return String.valueOf(this.getRecord());
-    }
-
     @Override
     public SummableArenaRecord<Integer> sum(Integer value) {
         return new IntegerRecord(this.getUserId(), this.getRecord() + value);

src/main/java/net/knarcraft/minigames/arena/record/LongRecord.java

@@ -7,7 +7,7 @@ import java.util.Map;
 import java.util.UUID;
 
 /**
- * A record storing a Long time
+ * A record storing a Long
  */
 public class LongRecord extends SummableArenaRecord<Long> {
 
@@ -29,22 +29,6 @@ public class LongRecord extends SummableArenaRecord<Long> {
         return new LongRecord(this.getUserId(), this.getRecord() + value);
     }
 
-    @Override
-    public String getAsString() {
-        int seconds = (int) Math.floor(getRecord() / 1000.0);
-        int minutes = 0;
-        if (seconds > 60) {
-            minutes = (int) Math.floor(seconds / 60.0);
-            seconds = seconds % 60;
-        }
-
-        if (minutes > 0) {
-            return minutes + "m" + seconds + "s";
-        } else {
-            return seconds + "s";
-        }
-    }
-
     /**
      * Deserializes the saved arena record
      *

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

@@ -39,6 +39,7 @@ public class CreateDropperArenaCommand implements CommandExecutor {
         }
 
         DropperArenaHandler arenaHandler = MiniGames.getInstance().getDropperArenaHandler();
+
         DropperArena existingArena = arenaHandler.getArena(arenaName);
         if (existingArena != null) {
             MiniGames.getInstance().getStringFormatter().displayErrorMessage(commandSender,

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

@@ -38,7 +38,7 @@ public class JoinDropperArenaCommand implements CommandExecutor {
         // Disallow joining if the player is already in a mini-game arena
         if (MiniGames.getInstance().getSession(player.getUniqueId()) != null) {
             stringFormatter.displayErrorMessage(commandSender, MiniGameMessage.ERROR_ALREADY_PLAYING);
-            return true;
+            return false;
         }
 
         // Make sure the arena exists
@@ -51,11 +51,10 @@ public class JoinDropperArenaCommand implements CommandExecutor {
         // Deny vehicles as allowing this is tricky, and will cause problems in some cases
         if (player.isInsideVehicle() || !player.getPassengers().isEmpty()) {
             stringFormatter.displayErrorMessage(commandSender, MiniGameMessage.ERROR_JOIN_IN_VEHICLE_OR_PASSENGER);
-            return true;
+            return false;
         }
 
-        joinArena(specifiedArena, player, arguments);
+        return joinArena(specifiedArena, player, arguments);
-        return true;
     }
 
     /**
@@ -64,12 +63,13 @@ public class JoinDropperArenaCommand implements CommandExecutor {
      * @param specifiedArena <p>The arena the player wants to join</p>
      * @param player         <p>The player joining the arena</p>
      * @param arguments      <p>The arguments given</p>
+     * @return <p>Whether the arena was joined successfully</p>
      */
-    private void joinArena(DropperArena specifiedArena, Player player, String[] arguments) {
+    private boolean joinArena(DropperArena specifiedArena, Player player, String[] arguments) {
         // Find the specified game-mode
         DropperArenaGameMode gameMode;
         if (arguments.length > 1) {
-            gameMode = DropperArenaGameMode.matchGameMode(arguments[1]);
+            gameMode = DropperArenaGameMode.matchGamemode(arguments[1]);
         } else {
             gameMode = DropperArenaGameMode.DEFAULT;
         }
@@ -77,7 +77,7 @@ public class JoinDropperArenaCommand implements CommandExecutor {
         // Make sure the player has beaten the necessary levels
         DropperArenaGroup arenaGroup = MiniGames.getInstance().getDropperArenaHandler().getGroup(specifiedArena.getArenaId());
         if (arenaGroup != null && !doGroupChecks(specifiedArena, arenaGroup, gameMode, player)) {
-            return;
+            return false;
         }
 
         StringFormatter stringFormatter = MiniGames.getInstance().getStringFormatter();
@@ -87,7 +87,7 @@ public class JoinDropperArenaCommand implements CommandExecutor {
                 gameMode != DropperArenaGameMode.DEFAULT &&
                 specifiedArena.getData().hasNotCompleted(DropperArenaGameMode.DEFAULT, player)) {
             stringFormatter.displayErrorMessage(player, MiniGameMessage.ERROR_NORMAL_MODE_REQUIRED);
-            return;
+            return false;
         }
 
         // Register the player's session
@@ -103,12 +103,14 @@ public class JoinDropperArenaCommand implements CommandExecutor {
         if (!teleported) {
             stringFormatter.displayErrorMessage(player, MiniGameMessage.ERROR_ARENA_TELEPORT_FAILED);
             newSession.triggerQuit(false, true);
+            return false;
         } else {
             // Update the player's state to follow the arena's rules
             newSession.getEntryState().setArenaState();
 
             player.getInventory().addItem(GUIHelper.getGUIOpenItem());
             stringFormatter.displaySuccessMessage(player, MiniGameMessage.SUCCESS_ARENA_JOINED);
+            return true;
         }
     }
 

src/main/java/net/knarcraft/minigames/command/parkour/CreateParkourArenaCommand.java

@@ -40,6 +40,7 @@ public class CreateParkourArenaCommand implements CommandExecutor {
         }
 
         ParkourArenaHandler arenaHandler = MiniGames.getInstance().getParkourArenaHandler();
+
         ParkourArena existingArena = arenaHandler.getArena(arenaName);
         if (existingArena != null) {
             stringFormatter.displayErrorMessage(commandSender, MiniGameMessage.ERROR_ARENA_NAME_COLLISION);

src/main/java/net/knarcraft/minigames/command/parkour/EditParkourArenaCommand.java

@@ -60,12 +60,7 @@ public class EditParkourArenaCommand implements CommandExecutor {
                     new String[]{editableProperty.getArgumentString(), value}));
             return true;
         } else {
-            boolean successful;
+            boolean successful = changeValue(specifiedArena, editableProperty, arguments[2], player);
-            try {
-                successful = changeValue(specifiedArena, editableProperty, arguments[2], player);
-            } catch (NumberFormatException exception) {
-                successful = false;
-            }
             if (successful) {
                 stringFormatter.displaySuccessMessage(player, stringFormatter.replacePlaceholder(
                         MiniGameMessage.SUCCESS_PROPERTY_CHANGED, "{property}",
@@ -85,10 +80,9 @@ public class EditParkourArenaCommand implements CommandExecutor {
      * @param value    <p>The new value of the property</p>
      * @param player   <p>The player trying to change the value</p>
      * @return <p>True if the value was successfully changed</p>
-     * @throws NumberFormatException <p>If unable to parse a given numeric value</p>
      */
     private boolean changeValue(@NotNull ParkourArena arena, @NotNull ParkourArenaEditableProperty property,
-                                @NotNull String value, @NotNull Player player) throws NumberFormatException {
+                                @NotNull String value, @NotNull Player player) {
         return switch (property) {
             case WIN_BLOCK_TYPE -> arena.setWinBlockType(parseMaterial(value));
             case SPAWN_LOCATION -> arena.setSpawnLocation(parseLocation(player, value));
@@ -98,7 +92,6 @@ public class EditParkourArenaCommand implements CommandExecutor {
             case CHECKPOINT_ADD -> arena.addCheckpoint(parseLocation(player, value));
             case CHECKPOINT_CLEAR -> arena.clearCheckpoints();
             case KILL_PLANE_BLOCKS -> arena.setKillPlaneBlocks(new HashSet<>(List.of(value.split(","))));
-            case OBSTACLE_BLOCKS -> arena.setObstacleBlocks(new HashSet<>(List.of(value.split(","))));
         };
     }
 

src/main/java/net/knarcraft/minigames/command/parkour/JoinParkourArenaCommand.java

@@ -38,7 +38,7 @@ public class JoinParkourArenaCommand implements CommandExecutor {
         // Disallow joining if the player is already in a mini-game arena
         if (MiniGames.getInstance().getSession(player.getUniqueId()) != null) {
             stringFormatter.displayErrorMessage(commandSender, MiniGameMessage.ERROR_ALREADY_PLAYING);
-            return true;
+            return false;
         }
 
         // Make sure the arena exists
@@ -51,11 +51,10 @@ public class JoinParkourArenaCommand implements CommandExecutor {
         // Deny vehicles as allowing this is tricky, and will cause problems in some cases
         if (player.isInsideVehicle() || !player.getPassengers().isEmpty()) {
             stringFormatter.displayErrorMessage(commandSender, MiniGameMessage.ERROR_JOIN_IN_VEHICLE_OR_PASSENGER);
-            return true;
+            return false;
         }
 
-        joinArena(specifiedArena, player, arguments);
+        return joinArena(specifiedArena, player, arguments);
-        return true;
     }
 
     /**
@@ -64,8 +63,9 @@ public class JoinParkourArenaCommand implements CommandExecutor {
      * @param specifiedArena <p>The arena the player wants to join</p>
      * @param player         <p>The player joining the arena</p>
      * @param arguments      <p>The arguments given</p>
+     * @return <p>Whether the arena was joined successfully</p>
      */
-    private void joinArena(ParkourArena specifiedArena, Player player, String[] arguments) {
+    private boolean joinArena(ParkourArena specifiedArena, Player player, String[] arguments) {
         // Find the specified game-mode
         ParkourArenaGameMode gameMode;
         if (arguments.length > 1) {
@@ -78,13 +78,13 @@ public class JoinParkourArenaCommand implements CommandExecutor {
         if (specifiedArena.hasNoCheckpoints() && gameMode == ParkourArenaGameMode.HARDCORE) {
             MiniGames.getInstance().getStringFormatter().displayErrorMessage(player,
                     MiniGameMessage.ERROR_HARDCORE_NO_CHECKPOINTS);
-            return;
+            return false;
         }
 
         // Make sure the player has beaten the necessary levels
         ParkourArenaGroup arenaGroup = MiniGames.getInstance().getParkourArenaHandler().getGroup(specifiedArena.getArenaId());
         if (arenaGroup != null && !doGroupChecks(specifiedArena, arenaGroup, gameMode, player)) {
-            return;
+            return false;
         }
 
         // Register the player's session
@@ -101,6 +101,7 @@ public class JoinParkourArenaCommand implements CommandExecutor {
             MiniGames.getInstance().getStringFormatter().displayErrorMessage(player,
                     MiniGameMessage.ERROR_ARENA_TELEPORT_FAILED);
             newSession.triggerQuit(false, true);
+            return false;
         } else {
             // Update the player's state to follow the arena's rules
             newSession.getEntryState().setArenaState();
@@ -108,6 +109,7 @@ public class JoinParkourArenaCommand implements CommandExecutor {
             player.getInventory().addItem(GUIHelper.getGUIOpenItem());
             MiniGames.getInstance().getStringFormatter().displaySuccessMessage(player,
                     MiniGameMessage.SUCCESS_ARENA_JOINED);
+            return true;
         }
     }
 

src/main/java/net/knarcraft/minigames/config/ParkourConfiguration.java

@@ -17,7 +17,6 @@ public class ParkourConfiguration extends MiniGameConfiguration {
     private boolean mustDoGroupedInSequence;
     private boolean ignoreRecordsUntilGroupBeatenOnce;
     private Set<Material> killPlaneBlocks;
-    private Set<Material> obstacleBlocks;
 
     /**
      * Instantiates a new dropper configuration
@@ -64,22 +63,12 @@ public class ParkourConfiguration extends MiniGameConfiguration {
         return new HashSet<>(this.killPlaneBlocks);
     }
 
-    /**
-     * Gets all types of blocks constituting parkour arena's obstacle blocks
-     *
-     * @return <p>The types of blocks constituting parkour arena's obstacle blocks</p>
-     */
-    public Set<Material> getObstacleBlocks() {
-        return new HashSet<>(this.obstacleBlocks);
-    }
-
     @Override
     protected void load() {
         this.enforceCheckpointOrder = configuration.getBoolean(rootNode + "enforceCheckpointOrder", false);
         this.mustDoGroupedInSequence = configuration.getBoolean(rootNode + "mustDoGroupedInSequence", true);
         this.ignoreRecordsUntilGroupBeatenOnce = configuration.getBoolean(rootNode + "ignoreRecordsUntilGroupBeatenOnce", false);
         this.killPlaneBlocks = loadMaterialList(rootNode + "killPlaneBlocks");
-        this.obstacleBlocks = loadMaterialList(rootNode + "obstacleBlocks");
     }
 
     @Override
@@ -93,10 +82,6 @@ public class ParkourConfiguration extends MiniGameConfiguration {
         for (Material material : killPlaneBlocks) {
             builder.append("\n  - ").append(material.name());
         }
-        builder.append("\n" + "Obstacle blocks: ");
-        for (Material material : obstacleBlocks) {
-            builder.append("\n  - ").append(material.name());
-        }
         return builder.toString();
     }
 

src/main/java/net/knarcraft/minigames/listener/MoveListener.java

@@ -3,7 +3,6 @@ package net.knarcraft.minigames.listener;
 import net.knarcraft.minigames.MiniGames;
 import net.knarcraft.minigames.arena.Arena;
 import net.knarcraft.minigames.arena.ArenaSession;
-import net.knarcraft.minigames.arena.dropper.DropperArena;
 import net.knarcraft.minigames.arena.dropper.DropperArenaGameMode;
 import net.knarcraft.minigames.arena.dropper.DropperArenaSession;
 import net.knarcraft.minigames.arena.parkour.ParkourArena;
@@ -15,13 +14,11 @@ import net.knarcraft.minigames.config.ParkourConfiguration;
 import net.knarcraft.minigames.config.SharedConfiguration;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerMoveEvent;
-import org.bukkit.util.BoundingBox;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
 
@@ -35,8 +32,6 @@ import java.util.Set;
  */
 public class MoveListener implements Listener {
 
-    private static final BoundingBox fullBlockBox = new BoundingBox(0, 0, 0, 1, 1, 1);
-
     private final DropperConfiguration dropperConfiguration;
     private final ParkourConfiguration parkourConfiguration;
 
@@ -54,15 +49,12 @@ public class MoveListener implements Listener {
     @EventHandler
     public void onPlayerMove(PlayerMoveEvent event) {
         // Ignore if no actual movement is happening
-        if (event.getTo() == null) {
+        if (event.getFrom().equals(event.getTo()) || event.getTo() == null) {
             return;
         }
 
         ArenaSession session = MiniGames.getInstance().getSession(event.getPlayer().getUniqueId());
         if (session instanceof DropperArenaSession dropperSession) {
-            if (event.getFrom().equals(event.getTo())) {
-                return;
-            }
             doDropperArenaChecks(event, dropperSession);
         } else if (session instanceof ParkourArenaSession parkourSession) {
             doParkourArenaChecks(event, parkourSession);
@@ -76,7 +68,8 @@ public class MoveListener implements Listener {
      * @param arenaSession <p>The dropper session of the player triggering the event</p>
      */
     private void doParkourArenaChecks(@NotNull PlayerMoveEvent event, ParkourArenaSession arenaSession) {
-        if (event.getTo() == null) {
+        // Ignore movement which won't cause the player's block to change
+        if (event.getTo() == null || event.getFrom().getBlock() == event.getTo().getBlock()) {
             return;
         }
 
@@ -196,140 +189,30 @@ public class MoveListener implements Listener {
      * @param toLocation   <p>The location the player's session is about to hit</p>
      * @return <p>True if a special block has been hit</p>
      */
-    private boolean checkForSpecialBlock(@NotNull ArenaSession arenaSession, @NotNull Location toLocation) {
+    private boolean checkForSpecialBlock(ArenaSession arenaSession, Location toLocation) {
         SharedConfiguration sharedConfiguration = MiniGames.getInstance().getSharedConfiguration();
-        double solidDepth = sharedConfiguration.getSolidHitBoxDistance();
         double liquidDepth = sharedConfiguration.getLiquidHitBoxDepth();
+        double solidDepth = sharedConfiguration.getSolidHitBoxDistance();
+
         Arena arena = arenaSession.getArena();
 
         // For water, only trigger when the player enters the water, but trigger earlier for everything else
-        Set<Block> potentialWinTriggerBlocks;
+        double depth = arena.winLocationIsSolid() ? solidDepth : liquidDepth;
-        if (arena.winLocationIsSolid()) {
+        for (Block block : getBlocksBeneathLocation(toLocation, depth)) {
-            potentialWinTriggerBlocks = getBlocksBeneathLocation(toLocation, solidDepth);
-        } else {
-            potentialWinTriggerBlocks = getBlocksBeneathLocation(toLocation, liquidDepth);
-        }
-        for (Block block : potentialWinTriggerBlocks) {
             if (arena.willCauseWin(block)) {
                 arenaSession.triggerWin();
                 return true;
             }
         }
 
-        if (arena instanceof DropperArena) {
+        // Check if the player is about to hit a non-air and non-liquid block
-            // Check if the player is about to hit a non-air and non-liquid block
+        for (Block block : getBlocksBeneathLocation(toLocation, solidDepth)) {
-            for (Block block : getBlocksBeneathLocation(toLocation, solidDepth)) {
+            if (!block.getType().isAir() && arena.willCauseLoss(block)) {
-                if (!block.getType().isAir() && !block.isLiquid() && arena.willCauseLoss(block)) {
-                    arenaSession.triggerLoss();
-                    return true;
-                }
-            }
-
-            // Check if the player has entered a liquid that causes a loss
-            for (Block block : getBlocksBeneathLocation(toLocation, liquidDepth)) {
-                if (block.isLiquid() && arena.willCauseLoss(block)) {
-                    arenaSession.triggerLoss();
-                    return true;
-                }
-            }
-        } else if (arena instanceof ParkourArena) {
-            return checkParkourDeathBlock((ParkourArenaSession) arenaSession, toLocation);
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks if a player is moving onto a block part of the parkour death plane
-     *
-     * @param arenaSession <p>The player's arena session</p>
-     * @param toLocation   <p>The location the player is moving to</p>
-     * @return <p>True if the player hit a death block</p>
-     */
-    private boolean checkParkourDeathBlock(@NotNull ParkourArenaSession arenaSession,
-                                           @NotNull Location toLocation) {
-        // A simple check, only for kill blocks
-        if (isOnKillBlock(arenaSession, toLocation)) {
-            return true;
-        }
-
-        // As the check for obstacle blocks is extensive, it's skipped if possible
-        Set<Material> obstacleBlocks = arenaSession.getArena().getObstacleBlocks();
-        if (obstacleBlocks.isEmpty()) {
-            return false;
-        }
-
-        // Create a hit-box approximate to the player's real hit-box
-        double playerHeight = 1.8;
-        Player player = Bukkit.getPlayer(arenaSession.getEntryState().getPlayerId());
-        if (player != null && player.isSneaking()) {
-            playerHeight = 1.5;
-        }
-        BoundingBox playerBox = new BoundingBox(-0.05, -0.05, -0.05,
-                0.6 + 0.05, playerHeight + 0.05, 0.6 + 0.05).shift(
-                toLocation).shift(-0.3, -0.05, -0.3);
-        BoundingBox playerPassableBox = new BoundingBox(0.2, 0.5, 0.2,
-                0.4, playerHeight - 0.5, 0.4).shift(
-                toLocation).shift(-0.3, 0, -0.3);
-        Set<Block> possiblyHitBlocks = new HashSet<>();
-        possiblyHitBlocks.addAll(getBlocksBeneathLocation(toLocation, 0, 0.01));
-        possiblyHitBlocks.addAll(getBlocksBeneathLocation(toLocation, 1, 0.01));
-        possiblyHitBlocks.addAll(getBlocksBeneathLocation(toLocation, -1, 0.01));
-        possiblyHitBlocks.addAll(getBlocksBeneathLocation(toLocation, -2, 0.01));
-
-        for (Block block : possiblyHitBlocks) {
-            if (!obstacleBlocks.contains(block.getType())) {
-                continue;
-            }
-
-            // For liquids, or anything without a proper collision shape, trigger collision if the player is partly 
-            // inside when treated as a full block
-            if (block.isLiquid() || block.getCollisionShape().getBoundingBoxes().isEmpty()) {
-                if (playerPassableBox.overlaps(fullBlockBox.clone().shift(block.getLocation()))) {
-                    arenaSession.triggerLoss();
-                    return true;
-                }
-            }
-
-            // Check whether the player's actual hit-box is intersecting with a block
-            for (BoundingBox boundingBox : block.getCollisionShape().getBoundingBoxes()) {
-                // A collision shape's bounding box is relative to 0,0 and therefore must be adjusted to the block's 
-                // location. Then overlap is checked by the player's collision box and the shifted bounding box.
-                if (playerBox.overlaps(boundingBox.clone().shift(block.getLocation()))) {
-                    arenaSession.triggerLoss();
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * As simple check for whether a player is moving on top of a kill block
-     *
-     * @param arenaSession <p>The arena session the player is in</p>
-     * @param toLocation   <p>The location the player is moving to</p>
-     * @return <p>True if the player is on a kill block, and a loss has been triggered</p>
-     */
-    private boolean isOnKillBlock(ParkourArenaSession arenaSession, Location toLocation) {
-        // If the player is standing on a non-full block, event.getTo will give the correct block, but if not, the 
-        // block below has to be checked instead.
-        Set<Block> blocksBelow = getBlocksBeneathLocation(toLocation, 0);
-        Set<Material> killPlaneBlocks = arenaSession.getArena().getKillPlaneBlocks();
-        for (Block block : blocksBelow) {
-            if (block.getType().isAir()) {
-                block = block.getLocation().clone().subtract(0, 0.2, 0).getBlock();
-                // Only trigger hit detection for passable blocks if the player is in the block
-                if (block.isPassable()) {
-                    continue;
-                }
-            }
-            if (killPlaneBlocks.contains(block.getType())) {
                 arenaSession.triggerLoss();
                 return true;
             }
         }
+
         return false;
     }
 
@@ -340,31 +223,12 @@ public class MoveListener implements Listener {
      * @return <p>The blocks beneath the player</p>
      */
     private Set<Block> getBlocksBeneathLocation(Location location, double depth) {
-        return getBlocksBeneathLocation(location, depth, 0);
-    }
-
-    /**
-     * Gets the blocks at the given location that will be affected by the player's hit-box
-     *
-     * @param location   <p>The location to check</p>
-     * @param extraRange <p>Extra range of the square used for finding blocks</p>
-     * @return <p>The blocks beneath the player</p>
-     */
-    private Set<Block> getBlocksBeneathLocation(Location location, double depth, double extraRange) {
         Set<Block> blocksBeneath = new HashSet<>();
-        double halfPlayerWidth = 0.3 + extraRange;
+        double halfPlayerWidth = 0.3;
         blocksBeneath.add(location.clone().subtract(halfPlayerWidth, depth, halfPlayerWidth).getBlock());
         blocksBeneath.add(location.clone().subtract(-halfPlayerWidth, depth, halfPlayerWidth).getBlock());
         blocksBeneath.add(location.clone().subtract(halfPlayerWidth, depth, -halfPlayerWidth).getBlock());
         blocksBeneath.add(location.clone().subtract(-halfPlayerWidth, depth, -halfPlayerWidth).getBlock());
-        // Once a certain size is reached, if the player is in the centre of a block, 9 must be accounted for
-        if (halfPlayerWidth > 0.5) {
-            blocksBeneath.add(location.getBlock());
-            blocksBeneath.add(location.clone().subtract(halfPlayerWidth, depth, 0).getBlock());
-            blocksBeneath.add(location.clone().subtract(-halfPlayerWidth, depth, 0).getBlock());
-            blocksBeneath.add(location.clone().subtract(0, depth, -halfPlayerWidth).getBlock());
-            blocksBeneath.add(location.clone().subtract(0, depth, halfPlayerWidth).getBlock());
-        }
         return blocksBeneath;
     }
 

src/main/java/net/knarcraft/minigames/placeholder/DropperRecordExpansion.java

@@ -26,7 +26,7 @@ public class DropperRecordExpansion extends RecordExpansion {
 
     @Override
     protected @NotNull ArenaGameMode parseGameMode(@NotNull String gameMode) {
-        return DropperArenaGameMode.matchGameMode(gameMode);
+        return DropperArenaGameMode.matchGamemode(gameMode);
     }
 
 }

src/main/java/net/knarcraft/minigames/placeholder/RecordExpansion.java

@@ -313,8 +313,8 @@ public abstract class RecordExpansion extends PlaceholderExpansion {
     private String getRecordData(@NotNull InfoType infoType, @NotNull ArenaRecord<?> arenaRecord) {
         return switch (infoType) {
             case PLAYER -> getPlayerName(arenaRecord.getUserId());
-            case VALUE -> arenaRecord.getAsString();
+            case VALUE -> arenaRecord.getRecord().toString();
-            case COMBINED -> getPlayerName(arenaRecord.getUserId()) + ": " + arenaRecord.getAsString();
+            case COMBINED -> getPlayerName(arenaRecord.getUserId()) + ": " + arenaRecord.getRecord().toString();
         };
     }
 

src/main/java/net/knarcraft/minigames/util/DropperArenaStorageHelper.java

@@ -20,7 +20,6 @@ import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.yaml.snakeyaml.error.YAMLException;
 
 import java.io.File;
 import java.io.IOException;
@@ -98,49 +97,22 @@ public final class DropperArenaStorageHelper {
         YamlConfiguration configuration = new YamlConfiguration();
         ConfigurationSection arenaSection = configuration.createSection(dropperArenasConfigurationSection);
         for (DropperArena arena : arenas.values()) {
-            saveDropperArena(arenaSection, arena);
+            //Note: While the arena name is used as the key, as the key has to be sanitized, the un-sanitized arena name
+            // must be stored as well
+            @NotNull ConfigurationSection configSection = arenaSection.createSection(arena.getArenaId().toString());
+            configSection.set(DropperArenaStorageKey.ID.getKey(), new SerializableUUID(arena.getArenaId()));
+            configSection.set(DropperArenaStorageKey.NAME.getKey(), arena.getArenaName());
+            configSection.set(DropperArenaStorageKey.SPAWN_LOCATION.getKey(), arena.getSpawnLocation());
+            configSection.set(DropperArenaStorageKey.EXIT_LOCATION.getKey(), arena.getExitLocation());
+            configSection.set(DropperArenaStorageKey.PLAYER_VERTICAL_VELOCITY.getKey(), arena.getPlayerVerticalVelocity());
+            configSection.set(DropperArenaStorageKey.PLAYER_HORIZONTAL_VELOCITY.getKey(), arena.getPlayerHorizontalVelocity());
+            configSection.set(DropperArenaStorageKey.WIN_BLOCK_TYPE.getKey(), new SerializableMaterial(arena.getWinBlockType()));
+            RewardStorageHelper.saveRewards(arena, configSection, DropperArenaStorageKey.REWARDS.getKey());
+            saveDropperArenaData(arena.getData());
         }
         configuration.save(dropperArenaFile);
     }
 
-    /**
-     * Saves a single arena
-     *
-     * @param arena <p>The arena to save</p>
-     * @throws IOException <p>If unable to write to the file</p>
-     */
-    public static void saveSingleDropperArena(DropperArena arena) throws IOException {
-        YamlConfiguration configuration = YamlConfiguration.loadConfiguration(dropperArenaFile);
-        ConfigurationSection arenaSection = configuration.getConfigurationSection(dropperArenasConfigurationSection);
-        if (arenaSection == null) {
-            arenaSection = configuration.createSection(dropperArenasConfigurationSection);
-        }
-        saveDropperArena(arenaSection, arena);
-        configuration.save(dropperArenaFile);
-    }
-
-    /**
-     * Updates the given configuration section with the arena's data, and stores arena data for the arena
-     *
-     * @param arenaSection <p>The configuration section to update</p>
-     * @param arena        <p>The arena to save</p>
-     * @throws IOException <p>If unable to save the arena data</p>
-     */
-    private static void saveDropperArena(ConfigurationSection arenaSection, DropperArena arena) throws IOException {
-        //Note: While the arena name is used as the key, as the key has to be sanitized, the un-sanitized arena name
-        // must be stored as well
-        @NotNull ConfigurationSection configSection = arenaSection.createSection(arena.getArenaId().toString());
-        configSection.set(DropperArenaStorageKey.ID.getKey(), new SerializableUUID(arena.getArenaId()));
-        configSection.set(DropperArenaStorageKey.NAME.getKey(), arena.getArenaName());
-        configSection.set(DropperArenaStorageKey.SPAWN_LOCATION.getKey(), arena.getSpawnLocation());
-        configSection.set(DropperArenaStorageKey.EXIT_LOCATION.getKey(), arena.getExitLocation());
-        configSection.set(DropperArenaStorageKey.PLAYER_VERTICAL_VELOCITY.getKey(), arena.getPlayerVerticalVelocity());
-        configSection.set(DropperArenaStorageKey.PLAYER_HORIZONTAL_VELOCITY.getKey(), arena.getPlayerHorizontalVelocity());
-        configSection.set(DropperArenaStorageKey.WIN_BLOCK_TYPE.getKey(), new SerializableMaterial(arena.getWinBlockType()));
-        RewardStorageHelper.saveRewards(arena, configSection, DropperArenaStorageKey.REWARDS.getKey());
-        saveDropperArenaData(arena.getData());
-    }
-
     /**
      * Loads all arenas
      *
@@ -250,14 +222,9 @@ public final class DropperArenaStorageHelper {
      * @return <p>The loaded arena data</p>
      */
     private static @Nullable DropperArenaData loadDropperArenaData(@NotNull UUID arenaId) {
-        try {
+        File arenaDataFile = getDropperArenaDataFile(arenaId);
-            File arenaDataFile = getDropperArenaDataFile(arenaId);
+        YamlConfiguration configuration = YamlConfiguration.loadConfiguration(arenaDataFile);
-            YamlConfiguration configuration = YamlConfiguration.loadConfiguration(arenaDataFile);
+        return (DropperArenaData) configuration.get(DropperArenaStorageKey.DATA.getKey());
-            return (DropperArenaData) configuration.get(DropperArenaStorageKey.DATA.getKey());
-        } catch (YAMLException exception) {
-            MiniGames.log(Level.SEVERE, "Unable to load arena data from arena " + arenaId);
-            return null;
-        }
     }
 
     /**

src/main/java/net/knarcraft/minigames/util/ParkourArenaStorageHelper.java

@@ -99,79 +99,23 @@ public final class ParkourArenaStorageHelper {
         YamlConfiguration configuration = new YamlConfiguration();
         ConfigurationSection arenaSection = configuration.createSection(parkourArenasConfigurationSection);
         for (ParkourArena arena : arenas.values()) {
-            saveParkourArena(arenaSection, arena);
+            //Note: While the arena name is used as the key, as the key has to be sanitized, the un-sanitized arena name
+            // must be stored as well
+            @NotNull ConfigurationSection configSection = arenaSection.createSection(arena.getArenaId().toString());
+            configSection.set(ParkourArenaStorageKey.ID.getKey(), new SerializableUUID(arena.getArenaId()));
+            configSection.set(ParkourArenaStorageKey.NAME.getKey(), arena.getArenaName());
+            configSection.set(ParkourArenaStorageKey.SPAWN_LOCATION.getKey(), arena.getSpawnLocation());
+            configSection.set(ParkourArenaStorageKey.EXIT_LOCATION.getKey(), arena.getExitLocation());
+            configSection.set(ParkourArenaStorageKey.WIN_BLOCK_TYPE.getKey(), new SerializableMaterial(arena.getWinBlockType()));
+            configSection.set(ParkourArenaStorageKey.WIN_LOCATION.getKey(), arena.getWinLocation());
+            configSection.set(ParkourArenaStorageKey.KILL_PLANE_BLOCKS.getKey(), arena.getKillPlaneBlockNames());
+            configSection.set(ParkourArenaStorageKey.CHECKPOINTS.getKey(), arena.getCheckpoints());
+            RewardStorageHelper.saveRewards(arena, configSection, ParkourArenaStorageKey.REWARDS.getKey());
+            saveParkourArenaData(arena.getData());
         }
         configuration.save(parkourArenaFile);
     }
 
-    /**
-     * Saves a single arena
-     *
-     * @param arena <p>The arena to save</p>
-     * @throws IOException <p>If unable to write to the file</p>
-     */
-    public static void saveSingleParkourArena(ParkourArena arena) throws IOException {
-        YamlConfiguration configuration = YamlConfiguration.loadConfiguration(parkourArenaFile);
-        ConfigurationSection arenaSection = configuration.getConfigurationSection(parkourArenasConfigurationSection);
-        if (arenaSection == null) {
-            arenaSection = configuration.createSection(parkourArenasConfigurationSection);
-        }
-        saveParkourArena(arenaSection, arena);
-        configuration.save(parkourArenaFile);
-    }
-
-    /**
-     * Updates the given configuration section with the arena's data, and stores arena data for the arena
-     *
-     * @param arenaSection <p>The configuration section to update</p>
-     * @param arena        <p>The arena to save</p>
-     * @throws IOException <p>If unable to save the arena data</p>
-     */
-    private static void saveParkourArena(ConfigurationSection arenaSection, ParkourArena arena) throws IOException {
-        //Note: While the arena name is used as the key, as the key has to be sanitized, the un-sanitized arena name
-        // must be stored as well
-        @NotNull ConfigurationSection configSection = arenaSection.createSection(arena.getArenaId().toString());
-        configSection.set(ParkourArenaStorageKey.ID.getKey(), new SerializableUUID(arena.getArenaId()));
-        configSection.set(ParkourArenaStorageKey.NAME.getKey(), arena.getArenaName());
-        configSection.set(ParkourArenaStorageKey.SPAWN_LOCATION.getKey(), arena.getSpawnLocation());
-        configSection.set(ParkourArenaStorageKey.EXIT_LOCATION.getKey(), arena.getExitLocation());
-        configSection.set(ParkourArenaStorageKey.WIN_BLOCK_TYPE.getKey(), new SerializableMaterial(arena.getWinBlockType()));
-        configSection.set(ParkourArenaStorageKey.WIN_LOCATION.getKey(), arena.getWinLocation());
-        configSection.set(ParkourArenaStorageKey.KILL_PLANE_BLOCKS.getKey(), getKillPlaneBlocks(arena));
-        configSection.set(ParkourArenaStorageKey.OBSTACLE_BLOCKS.getKey(), getObstacleBlocks(arena));
-        configSection.set(ParkourArenaStorageKey.CHECKPOINTS.getKey(), arena.getCheckpoints());
-        RewardStorageHelper.saveRewards(arena, configSection, ParkourArenaStorageKey.REWARDS.getKey());
-        saveParkourArenaData(arena.getData());
-    }
-
-    /**
-     * Gets a list of the kill plane blocks for the given arena
-     *
-     * @param arena <p>The arena to get kill plane blocks for</p>
-     * @return <p>The kill plane blocks</p>
-     */
-    private static List<String> getKillPlaneBlocks(ParkourArena arena) {
-        if (arena.getKillPlaneBlockNames() == null) {
-            return new ArrayList<>();
-        } else {
-            return new ArrayList<>(arena.getKillPlaneBlockNames());
-        }
-    }
-
-    /**
-     * Gets a list of the obstacle blocks for the given arena
-     *
-     * @param arena <p>The arena to get obstacle blocks for</p>
-     * @return <p>The obstacle blocks</p>
-     */
-    private static List<String> getObstacleBlocks(ParkourArena arena) {
-        if (arena.getObstacleBlockNames() == null) {
-            return new ArrayList<>();
-        } else {
-            return new ArrayList<>(arena.getObstacleBlockNames());
-        }
-    }
-
     /**
      * Loads all arenas
      *
@@ -219,20 +163,7 @@ public final class ParkourArenaStorageHelper {
         Location winLocation = (Location) configurationSection.get(ParkourArenaStorageKey.WIN_LOCATION.getKey());
         SerializableMaterial winBlockType = (SerializableMaterial) configurationSection.get(
                 ParkourArenaStorageKey.WIN_BLOCK_TYPE.getKey());
-        List<?> killPlaneBlockNamesList = configurationSection.getList(ParkourArenaStorageKey.KILL_PLANE_BLOCKS.getKey());
+        List<?> killPlaneBlockNames = configurationSection.getList(ParkourArenaStorageKey.KILL_PLANE_BLOCKS.getKey());
-        Set<String> killPlaneBlockNames;
-        if (killPlaneBlockNamesList == null) {
-            killPlaneBlockNames = null;
-        } else {
-            killPlaneBlockNames = new HashSet<>((List<String>) killPlaneBlockNamesList);
-        }
-        List<?> obstacleBlockNamesList = configurationSection.getList(ParkourArenaStorageKey.OBSTACLE_BLOCKS.getKey());
-        Set<String> obstacleBlockNames;
-        if (obstacleBlockNamesList == null) {
-            obstacleBlockNames = null;
-        } else {
-            obstacleBlockNames = new HashSet<>((List<String>) obstacleBlockNamesList);
-        }
         List<Location> checkpoints = (List<Location>) configurationSection.get(ParkourArenaStorageKey.CHECKPOINTS.getKey());
 
         Map<RewardCondition, Set<Reward>> rewards = RewardStorageHelper.loadRewards(configurationSection,
@@ -264,7 +195,7 @@ public final class ParkourArenaStorageHelper {
         }
 
         return new ParkourArena(arenaId, arenaName, spawnLocation, exitLocation, winBlockType.getRawValue(), winLocation,
-                killPlaneBlockNames, obstacleBlockNames, checkpoints, rewards, arenaData,
+                (Set<String>) killPlaneBlockNames, checkpoints, rewards, arenaData,
                 MiniGames.getInstance().getParkourArenaHandler());
     }
 

src/main/java/net/knarcraft/minigames/util/TabCompleteHelper.java

@@ -104,30 +104,11 @@ public final class TabCompleteHelper {
             tabCompleteSuggestions.put(EditablePropertyType.BLOCK_TYPE, getBlockTypeSuggestions());
             tabCompleteSuggestions.put(EditablePropertyType.CHECKPOINT_CLEAR, getCheckpointClearSuggestions());
             tabCompleteSuggestions.put(EditablePropertyType.MATERIAL_LIST, getMaterialListSuggestions());
-            tabCompleteSuggestions.put(EditablePropertyType.DOUBLE, getDoubleSuggestions());
         }
 
         return tabCompleteSuggestions.get(propertyType);
     }
 
-    /**
-     * Gets suggestions for double values
-     *
-     * @return <p>A list of suggestions</p>
-     */
-    private static List<String> getDoubleSuggestions() {
-        List<String> suggestions = new ArrayList<>();
-        suggestions.add("0");
-        suggestions.add("0.01");
-        suggestions.add("0.1");
-        suggestions.add("0.2");
-        suggestions.add("0.3");
-        suggestions.add("0.4");
-        suggestions.add("0.5");
-        suggestions.add("1");
-        return suggestions;
-    }
-
     /**
      * Gets suggestions for a list of materials
      *
@@ -137,7 +118,6 @@ public final class TabCompleteHelper {
         List<String> suggestions = new ArrayList<>();
         suggestions.add("LAVA,MAGMA_BLOCK");
         suggestions.add("WATER,MAGMA_BLOCK,LAVA,+BUTTONS,+CORALS");
-        suggestions.add("CHAIN,END_ROD,LIGHTNING_ROD");
         return suggestions;
     }
 

src/main/resources/config.yml

@@ -20,12 +20,6 @@ parkour:
   killPlaneBlocks:
     - LAVA
     - MAGMA_BLOCK
-  
-  # The blocks treated as obstacles in a parkour arena, which will trigger a loss in any direction
-  obstacleBlocks:
-    - END_ROD
-    - LIGHTNING_ROD
-    - CHAIN
 dropper:
   # Whether to block using the shift key to drop faster than the intended drop speed
   blockSneaking: true
@@ -69,7 +63,6 @@ dropper:
     - +BUTTONS
     - +CORALS
     - +WALL_CORALS
-    - LIGHT
 shared:
   # This decides how far inside a non-solid block the player must go before detection triggers (-1, 0). The closer to -1
   # it is, the more accurate it will seem to the player, but the likelihood of not detecting the hit increases.

src/main/resources/plugin.yml

@@ -82,15 +82,15 @@ commands:
     aliases:
       - dcreate
     permission: minigames.create.dropper
-    usage: /<command> <arena>
+    usage: |
+      /<command> <arena> <property> [new value]
+      - Valid properties: name, spawnLocation, exitLocation, verticalVelocity, horizontalVelocity, winBlockType
     description: Used to create a new dropper arena
   dropperEdit:
     aliases:
       - dedit
     permission: minigames.edit.dropper
-    usage: |
+    usage: /<command> (Details not finalized)
-      /<command> <arena> <property> [new value]
-      - Valid properties: name, spawnLocation, exitLocation, verticalVelocity, horizontalVelocity, winBlockType
     description: Used to edit an existing dropper arena
   dropperRemove:
     aliases:
@@ -143,19 +143,19 @@ commands:
     aliases:
       - pcreate
     permission: minigames.create.parkour
-    usage: /<command> <arena>
+    usage: |
+      /<command> <arena> <property> [new value]
+      - Valid properties: name, spawnLocation, exitLocation, winBlockType, winLocation, checkpointAdd, checkpointClear, killPlaneBlocks
     description: Used to create a new parkour arena
   parkourEdit:
     aliases:
       - pedit
     permission: minigames.edit.parkour
-    usage: |
+    usage: /<command> (Details not finalized)
-      /<command> <arena> <property> [new value]
-      - Valid properties: name, spawnLocation, exitLocation, winBlockType, winLocation, checkpointAdd, checkpointClear, killPlaneBlocks
     description: Used to edit an existing parkour arena
   parkourRemove:
     aliases:
-      - premove
+      - dremove
     permission: minigames.remove.parkour
     usage: /<command> <arena>
     description: Used to remove an existing parkour arena

src/test/java/net/knarcraft/minigames/arena/MiniGamesArenaGroupTest.java

@@ -0,0 +1,51 @@
+package net.knarcraft.minigames.arena;
+
+import net.knarcraft.minigames.arena.dropper.DropperArenaGroup;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * Tests for arena dropper groups
+ */
+public class MiniGamesArenaGroupTest {
+
+    @Test
+    public void swapTest() {
+        /*
+           This test makes sure the order of arenas is as expected when the arenas are added to a group. It also makes
+           sure that swapping two items works as expected.
+         */
+
+        DropperArenaGroup arenaGroup = new DropperArenaGroup("test");
+        UUID arena1Id = UUID.randomUUID();
+        UUID arena2Id = UUID.randomUUID();
+        UUID arena3Id = UUID.randomUUID();
+        UUID arena4Id = UUID.randomUUID();
+
+        arenaGroup.addArena(arena1Id);
+        arenaGroup.addArena(arena2Id);
+        arenaGroup.addArena(arena3Id);
+        arenaGroup.addArena(arena4Id);
+
+        List<UUID> initialOrder = new ArrayList<>();
+        initialOrder.add(arena1Id);
+        initialOrder.add(arena2Id);
+        initialOrder.add(arena3Id);
+        initialOrder.add(arena4Id);
+        Assertions.assertEquals(initialOrder, arenaGroup.getArenas());
+
+        arenaGroup.swapArenas(1, 3);
+
+        List<UUID> swapped = new ArrayList<>();
+        swapped.add(arena1Id);
+        swapped.add(arena4Id);
+        swapped.add(arena3Id);
+        swapped.add(arena2Id);
+        Assertions.assertEquals(swapped, arenaGroup.getArenas());
+    }
+
+}