diff --git a/src/de/steamwar/bungeecore/commands/AlertCommand.java b/src/de/steamwar/bungeecore/commands/AlertCommand.java index 9befd06..e1ac773 100644 --- a/src/de/steamwar/bungeecore/commands/AlertCommand.java +++ b/src/de/steamwar/bungeecore/commands/AlertCommand.java @@ -37,11 +37,6 @@ public class AlertCommand extends BasicCommand { return; } - StringBuilder msgBuilder = new StringBuilder(); - msgBuilder.append(BungeeCore.CHAT_PREFIX); - for (String arg : args){ - msgBuilder.append(arg).append(" "); - } - Message.broadcast("ALERT", ChatColor.translateAlternateColorCodes('&', msgBuilder.toString())); + Message.broadcast("ALERT", ChatColor.translateAlternateColorCodes('&', BungeeCore.CHAT_PREFIX + String.join(" ", args))); } } diff --git a/src/de/steamwar/bungeecore/commands/BanCommand.java b/src/de/steamwar/bungeecore/commands/BanCommand.java index f770ee8..bccd5d9 100644 --- a/src/de/steamwar/bungeecore/commands/BanCommand.java +++ b/src/de/steamwar/bungeecore/commands/BanCommand.java @@ -75,7 +75,7 @@ public class BanCommand extends BasicCommand { Date parsedDate = dateFormat.parse(arg.split("_")[0]); return new java.sql.Timestamp(parsedDate.getTime()); }catch(ParseException exception){ - Message.send("BAN_INVALID_TIME", sender); + Message.send("INVALID_TIME", sender); return null; } } diff --git a/src/de/steamwar/bungeecore/commands/BasicCommand.java b/src/de/steamwar/bungeecore/commands/BasicCommand.java index 5e4565c..9cdf19a 100644 --- a/src/de/steamwar/bungeecore/commands/BasicCommand.java +++ b/src/de/steamwar/bungeecore/commands/BasicCommand.java @@ -56,7 +56,7 @@ abstract class BasicCommand extends Command implements TabExecutor { protected SteamwarUser user(CommandSender sender, String arg){ SteamwarUser target = SteamwarUser.get(arg); if(target == null) - Message.send("UNKNWON_PLAYER", sender); + Message.send("UNKNOWN_PLAYER", sender); return target; } } diff --git a/src/de/steamwar/bungeecore/commands/BugCommand.java b/src/de/steamwar/bungeecore/commands/BugCommand.java index 74ff27c..2f60785 100644 --- a/src/de/steamwar/bungeecore/commands/BugCommand.java +++ b/src/de/steamwar/bungeecore/commands/BugCommand.java @@ -40,6 +40,6 @@ public class BugCommand extends BasicCommand { String message = String.join(" ", args); SteamwarUser user = SteamwarUser.get(player.getUniqueId()); SWException.log(server, message, player.getName() + " " + user.getId()); - Message.send("BUG_SAVED", player); + Message.send("BUG_MESSAGE", player); } } diff --git a/src/de/steamwar/bungeecore/commands/IgnoreCommand.java b/src/de/steamwar/bungeecore/commands/IgnoreCommand.java index ef10839..9151fde 100644 --- a/src/de/steamwar/bungeecore/commands/IgnoreCommand.java +++ b/src/de/steamwar/bungeecore/commands/IgnoreCommand.java @@ -45,17 +45,19 @@ public class IgnoreCommand extends BasicCommand { SteamwarUser target = SteamwarUser.get(args[0]); if(target == null){ - Message.send("UNKNWON_PLAYER", p); + Message.send("UNKNOWN_PLAYER", p); return; - }else if(target.equals(user)){ + } + if(target.equals(user)){ Message.send("IGNORE_YOURSELF", p); return; - }else if(IgnoreSystem.isIgnored(user, target)){ + } + if(IgnoreSystem.isIgnored(user, target)){ Message.send("IGNORE_ALREADY", p); return; } IgnoreSystem.ignore(user, target); - Message.send("IGNORE_IGNORE", p, target.getUserName()); + Message.send("IGNORE_MESSAGE", p, target.getUserName()); } } diff --git a/src/de/steamwar/messages/BungeeCore.properties b/src/de/steamwar/messages/BungeeCore.properties index f5c0d47..711e223 100644 --- a/src/de/steamwar/messages/BungeeCore.properties +++ b/src/de/steamwar/messages/BungeeCore.properties @@ -1,7 +1,8 @@ PREFIX=§eSteam§8War» UNKNOWN_COMMAND=§cUnbekannter Befehl. -UNKNWON_PLAYER=§cDiesen Spieler gibt es nicht. +UNKNOWN_PLAYER=§cDiesen Spieler gibt es nicht. +INVALID_TIME=§cUngültige Zeitangabe. #Help command HELP_LOBBY=§7Kehre von überall mit §8/§el §7zur Lobby zurück! @@ -78,12 +79,16 @@ BAN_INVALID_TIME=§cUngültige Zeitangabe. BAN_PERMA=Permanent BAN_UNTIL=bis zum -BUG_SAVED=§7Dein Bugreport wurde gespeichert. +MUTE_MESSAGE_YOU=§7Du hast §e{0} §7gemutet§8. §7Grund§8: §c{1} + +BUG_MESSAGE=§7Dein Bugreport wurde gespeichert. IGNORE_YOURSELF=§cWie willst du dich selber ignorieren? IGNORE_ALREADY=§cDu ignorierst diesen Spieler bereits. IGNORE_IGNORE=§7Du ignorierst nun §e{0}§8. +IGNORE_MESSAGE=§7Du ignorierst nun §e{0}§8. + #PollresultCommand POLLRESULT_NOPOLL=§cDerzeit läuft keine Umfrage. POLLRESULT_HEADER=§eEs haben {0} abgestimmt auf die Frage: §7{1}