diff --git a/src/main/java/io/github/a5h73y/parkour/type/player/PlayerManager.java b/src/main/java/io/github/a5h73y/parkour/type/player/PlayerManager.java index f9963ca7..adb70827 100644 --- a/src/main/java/io/github/a5h73y/parkour/type/player/PlayerManager.java +++ b/src/main/java/io/github/a5h73y/parkour/type/player/PlayerManager.java @@ -431,7 +431,7 @@ public void playerDie(Player player) { } else { TranslationUtils.sendValueTranslation("Parkour.MaxDeaths", - String.valueOf(session.getCourse().getMaxDeaths())); + String.valueOf(session.getCourse().getMaxDeaths()), player); leaveCourse(player); return; } diff --git a/src/main/java/io/github/a5h73y/parkour/utility/SignUtils.java b/src/main/java/io/github/a5h73y/parkour/utility/SignUtils.java index 920b044e..3a1ad15e 100644 --- a/src/main/java/io/github/a5h73y/parkour/utility/SignUtils.java +++ b/src/main/java/io/github/a5h73y/parkour/utility/SignUtils.java @@ -29,7 +29,7 @@ public static void createStandardSign(SignChangeEvent signEvent, Player player, signEvent.setLine(1, signType); signEvent.setLine(2, ""); signEvent.setLine(3, "-----"); - TranslationUtils.sendValueTranslation("Parkour.SignCreated", signType); + TranslationUtils.sendValueTranslation("Parkour.SignCreated", signType, player); } /** @@ -70,7 +70,7 @@ public static boolean createStandardCourseSign(SignChangeEvent signEvent, Player signEvent.setLine(1, signType); if (displayMessage) { - TranslationUtils.sendValueTranslation("Parkour.SignCreated", signType); + TranslationUtils.sendValueTranslation("Parkour.SignCreated", signType, player); } return true; } @@ -93,7 +93,7 @@ public static void createJoinCourseSign(SignChangeEvent signEvent, Player player signEvent.setLine(3, ChatColor.RED + String.valueOf(minimumLevel)); } - TranslationUtils.sendValueTranslation("Parkour.SignCreated", "Join"); + TranslationUtils.sendValueTranslation("Parkour.SignCreated", "Join", player); } /** @@ -112,7 +112,7 @@ public static void createLobbyJoinSign(SignChangeEvent signEvent, Player player) if (signEvent.getLine(2).isEmpty()) { signEvent.setLine(3, ""); - TranslationUtils.sendValueTranslation("Parkour.SignCreated", "Lobby"); + TranslationUtils.sendValueTranslation("Parkour.SignCreated", "Lobby", player); } else { String lobbyName = signEvent.getLine(2); @@ -127,7 +127,7 @@ public static void createLobbyJoinSign(SignChangeEvent signEvent, Player player) if (LobbyInfo.hasRequiredLevel(lobbyName)) { signEvent.setLine(3, ChatColor.RED + LobbyInfo.getRequiredLevel(lobbyName).toString()); } - TranslationUtils.sendValueTranslation("Parkour.SignCreated", "Lobby"); + TranslationUtils.sendValueTranslation("Parkour.SignCreated", "Lobby", player); } } @@ -148,14 +148,14 @@ public static void createEffectSign(SignChangeEvent signEvent, Player player) { if (signEvent.getLine(2).equalsIgnoreCase("heal")) { signEvent.setLine(2, "Heal"); - TranslationUtils.sendValueTranslation("Parkour.SignCreated", "Heal Effect"); + TranslationUtils.sendValueTranslation("Parkour.SignCreated", "Heal Effect", player); } else if (signEvent.getLine(2).equalsIgnoreCase("gamemode")) { signEvent.setLine(2, "GameMode"); if (PluginUtils.doesGameModeExist(signEvent.getLine(3))) { signEvent.setLine(3, signEvent.getLine(3).toUpperCase()); - TranslationUtils.sendValueTranslation("Parkour.SignCreated", "GameMode Effect"); + TranslationUtils.sendValueTranslation("Parkour.SignCreated", "GameMode Effect", player); } else { signEvent.getBlock().breakNaturally(); @@ -198,7 +198,7 @@ public static void createLeaderboardsSign(SignChangeEvent signEvent, Player play signEvent.setLine(3, ""); } - TranslationUtils.sendValueTranslation("Parkour.SignCreated", "Leaderboard"); + TranslationUtils.sendValueTranslation("Parkour.SignCreated", "Leaderboard", player); } /** @@ -218,7 +218,7 @@ public static void createCheckpointSign(SignChangeEvent signEvent, Player player return; } - TranslationUtils.sendValueTranslation("Parkour.SignCreated", "Checkpoint"); + TranslationUtils.sendValueTranslation("Parkour.SignCreated", "Checkpoint", player); } /** diff --git a/src/main/java/io/github/a5h73y/parkour/utility/TranslationUtils.java b/src/main/java/io/github/a5h73y/parkour/utility/TranslationUtils.java index e6e347ed..bc3af852 100644 --- a/src/main/java/io/github/a5h73y/parkour/utility/TranslationUtils.java +++ b/src/main/java/io/github/a5h73y/parkour/utility/TranslationUtils.java @@ -34,7 +34,9 @@ public static String getTranslation(String translationKey, boolean prefix) { String translated = Parkour.getConfig(ConfigType.STRINGS).getString(translationKey); translated = translated != null ? colour(translated) : "String not found: " + translationKey; - return prefix ? Parkour.getPrefix().concat(translated) : translated; + + return (prefix && ValidationUtils.isStringValid(translated)) + ? Parkour.getPrefix().concat(translated) : translated; } /** @@ -120,8 +122,10 @@ public static String getCourseEventMessage(String courseName, ParkourEventType e */ public static void sendTranslation(String translationKey, boolean prefix, CommandSender... players) { String translation = getTranslation(translationKey, prefix); - for (CommandSender player : players) { - player.sendMessage(translation); + if (!translation.isEmpty()) { + for (CommandSender player : players) { + player.sendMessage(translation); + } } } @@ -156,9 +160,11 @@ public static void sendValueTranslation(String translationKey, String value, Com */ public static void sendValueTranslation(String translationKey, String value, boolean prefix, CommandSender... players) { String translation = getValueTranslation(translationKey, value, prefix); - for (CommandSender player : players) { - if (player != null) { - player.sendMessage(translation); + if (!translation.isEmpty()) { + for (CommandSender player : players) { + if (player != null) { + player.sendMessage(translation); + } } } }