From 9b1866e6cc87fb23f4c146749d1ff26202d58455 Mon Sep 17 00:00:00 2001 From: Andreas Troelsen Date: Sat, 18 Feb 2017 03:36:35 +0100 Subject: [PATCH] Replace spaces in class names when toLowerCase'ing them. --- .../java/com/garbagemule/MobArena/ArenaClass.java | 14 ++------------ .../com/garbagemule/MobArena/ArenaListener.java | 4 ++-- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/garbagemule/MobArena/ArenaClass.java b/src/main/java/com/garbagemule/MobArena/ArenaClass.java index 808e39b..d6e04b3 100644 --- a/src/main/java/com/garbagemule/MobArena/ArenaClass.java +++ b/src/main/java/com/garbagemule/MobArena/ArenaClass.java @@ -29,7 +29,7 @@ public class ArenaClass */ public ArenaClass(String name, double price, boolean unbreakableWeapons, boolean unbreakableArmor) { this.configName = name; - this.lowercaseName = name.toLowerCase(); + this.lowercaseName = name.toLowerCase().replace(" ", ""); this.items = new ArrayList(); this.armor = new ArrayList(4); @@ -347,20 +347,10 @@ public class ArenaClass private ArenaMaster am; public MyItems(double price, boolean unbreakableWeapons, boolean unbreakableArmor, ArenaMaster am) { - super("", price, unbreakableWeapons, unbreakableArmor); + super("My Items", price, unbreakableWeapons, unbreakableArmor); this.am = am; } - @Override - public String getConfigName() { - return "My Items"; - } - - @Override - public String getLowercaseName() { - return "myitems"; - } - @Override public void grantItems(Player p) { Arena arena = am.getArenaWithPlayer(p); diff --git a/src/main/java/com/garbagemule/MobArena/ArenaListener.java b/src/main/java/com/garbagemule/MobArena/ArenaListener.java index cdbc7c3..d4f7f90 100644 --- a/src/main/java/com/garbagemule/MobArena/ArenaListener.java +++ b/src/main/java/com/garbagemule/MobArena/ArenaListener.java @@ -1004,7 +1004,7 @@ public class ArenaListener private void handleSign(Sign sign, Player p) { // Check if the first line is a class name. - String className = ChatColor.stripColor(sign.getLine(0)).toLowerCase(); + String className = ChatColor.stripColor(sign.getLine(0)).toLowerCase().replace(" ", ""); if (!arena.getClasses().containsKey(className) && !className.equals("random")) return; @@ -1063,7 +1063,7 @@ public class ArenaListener public void run() { if (!className.equalsIgnoreCase("random")) { if (useClassChests) { - ArenaClass ac = plugin.getArenaMaster().getClasses().get(className.toLowerCase()); + ArenaClass ac = plugin.getArenaMaster().getClasses().get(className.toLowerCase().replace(" ", "")); if (ClassChests.assignClassFromStoredClassChest(arena, p, ac)) { return; }