From fbe80d7ee60ed7f5ba56a4ed2dcad2af306ec488 Mon Sep 17 00:00:00 2001 From: Andreas Troelsen Date: Sat, 18 Feb 2017 03:34:28 +0100 Subject: [PATCH] Use config-file names for classes in messages. --- src/main/java/com/garbagemule/MobArena/ArenaImpl.java | 2 +- src/main/java/com/garbagemule/MobArena/ArenaListener.java | 2 +- .../garbagemule/MobArena/commands/user/PickClassCommand.java | 2 +- src/main/java/com/garbagemule/MobArena/util/ClassChests.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/garbagemule/MobArena/ArenaImpl.java b/src/main/java/com/garbagemule/MobArena/ArenaImpl.java index c0ab053..a2c012e 100644 --- a/src/main/java/com/garbagemule/MobArena/ArenaImpl.java +++ b/src/main/java/com/garbagemule/MobArena/ArenaImpl.java @@ -1247,7 +1247,7 @@ public class ArenaImpl implements Arena } assignClass(p, className); - Messenger.tell(p, Msg.LOBBY_CLASS_PICKED, TextUtils.camelCase(className)); + Messenger.tell(p, Msg.LOBBY_CLASS_PICKED, this.classes.get(className).getConfigName()); } @Override diff --git a/src/main/java/com/garbagemule/MobArena/ArenaListener.java b/src/main/java/com/garbagemule/MobArena/ArenaListener.java index 745b2fb..cdbc7c3 100644 --- a/src/main/java/com/garbagemule/MobArena/ArenaListener.java +++ b/src/main/java/com/garbagemule/MobArena/ArenaListener.java @@ -1073,7 +1073,7 @@ public class ArenaListener // Otherwise just fall through and use the items from the config-file } arena.assignClass(p, className); - Messenger.tell(p, Msg.LOBBY_CLASS_PICKED, TextUtils.camelCase(className)); + Messenger.tell(p, Msg.LOBBY_CLASS_PICKED, arena.getClasses().get(className).getConfigName()); if (price > 0D) { Messenger.tell(p, Msg.LOBBY_CLASS_PRICE, plugin.economyFormat(price)); } diff --git a/src/main/java/com/garbagemule/MobArena/commands/user/PickClassCommand.java b/src/main/java/com/garbagemule/MobArena/commands/user/PickClassCommand.java index d2e5a92..33b0df1 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/user/PickClassCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/user/PickClassCommand.java @@ -96,7 +96,7 @@ public class PickClassCommand implements Command // No linked chest? Fall through to config-file } arena.assignClass(p, lowercase); - Messenger.tell(p, Msg.LOBBY_CLASS_PICKED, TextUtils.camelCase(lowercase)); + Messenger.tell(p, Msg.LOBBY_CLASS_PICKED, arena.getClasses().get(lowercase).getConfigName()); if (price > 0D) { Messenger.tell(p, Msg.LOBBY_CLASS_PRICE, am.getPlugin().economyFormat(price)); } diff --git a/src/main/java/com/garbagemule/MobArena/util/ClassChests.java b/src/main/java/com/garbagemule/MobArena/util/ClassChests.java index 17b42e0..7fe7675 100644 --- a/src/main/java/com/garbagemule/MobArena/util/ClassChests.java +++ b/src/main/java/com/garbagemule/MobArena/util/ClassChests.java @@ -97,7 +97,7 @@ public class ClassChests { contents = newContents; } arena.assignClassGiveInv(player, classname, contents); - Messenger.tell(player, Msg.LOBBY_CLASS_PICKED, TextUtils.camelCase(classname)); + Messenger.tell(player, Msg.LOBBY_CLASS_PICKED, arena.getClasses().get(classname).getConfigName()); double price = ac.getPrice(); if (price > 0D) {