From 66ae360412445513d27538fecc7bd64b606d0407 Mon Sep 17 00:00:00 2001 From: Fabrizio La Rosa Date: Wed, 8 Jul 2020 08:04:02 +0200 Subject: [PATCH] Optimized admin upgrades commands --- .../commands/admin/AddUpgradeCommand.java | 16 +++++++--------- .../commands/admin/RemoveUpgradeCommand.java | 18 ++++++++---------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/songoda/skyblock/command/commands/admin/AddUpgradeCommand.java b/src/main/java/com/songoda/skyblock/command/commands/admin/AddUpgradeCommand.java index 6f700d12..7150ba59 100644 --- a/src/main/java/com/songoda/skyblock/command/commands/admin/AddUpgradeCommand.java +++ b/src/main/java/com/songoda/skyblock/command/commands/admin/AddUpgradeCommand.java @@ -58,16 +58,14 @@ public class AddUpgradeCommand extends SubCommand { targetPlayerName = targetPlayer.getName(); } - Upgrade.Type upgrade = null; - - for (Upgrade.Type upgradeList : Upgrade.Type.values()) { - if (upgradeList != Upgrade.Type.Size) { - if (args[1].toUpperCase().equals(upgradeList.name().toUpperCase())) { - upgrade = upgradeList; - - break; - } + Upgrade.Type upgrade; + try { + upgrade = Upgrade.Type.valueOf(args[1].toUpperCase()); + if(upgrade.equals(Upgrade.Type.Size) || upgrade.equals(Upgrade.Type.Members)){ + upgrade = null; } + } catch(IllegalArgumentException e) { + upgrade = null; } if (islandOwnerUUID == null) { diff --git a/src/main/java/com/songoda/skyblock/command/commands/admin/RemoveUpgradeCommand.java b/src/main/java/com/songoda/skyblock/command/commands/admin/RemoveUpgradeCommand.java index cfa3c36f..382f8260 100644 --- a/src/main/java/com/songoda/skyblock/command/commands/admin/RemoveUpgradeCommand.java +++ b/src/main/java/com/songoda/skyblock/command/commands/admin/RemoveUpgradeCommand.java @@ -57,17 +57,15 @@ public class RemoveUpgradeCommand extends SubCommand { islandOwnerUUID = playerDataManager.getPlayerData(targetPlayer).getOwner(); targetPlayerName = targetPlayer.getName(); } - - Upgrade.Type upgrade = null; - - for (Upgrade.Type upgradeList : Upgrade.Type.values()) { - if (upgradeList != Upgrade.Type.Size) { - if (args[1].toUpperCase().equals(upgradeList.name().toUpperCase())) { - upgrade = upgradeList; - - break; - } + + Upgrade.Type upgrade; + try { + upgrade = Upgrade.Type.valueOf(args[1].toUpperCase()); + if(upgrade.equals(Upgrade.Type.Size) || upgrade.equals(Upgrade.Type.Members)){ + upgrade = null; } + } catch(IllegalArgumentException e) { + upgrade = null; } if (islandOwnerUUID == null) {