diff --git a/pom.xml b/pom.xml index 1a0f15f..deee3be 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ ru.simsonic rscPermissions - 0.9.18b + 0.9.19b jar rscPermissions @@ -84,7 +84,7 @@ ru.simsonic rscMinecraftLibrary - 2.1.0 + 2.1.1 compile diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java index 35eb849..f2f95e8 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java +++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java @@ -8,6 +8,7 @@ import org.bukkit.entity.Player; import ru.simsonic.rscCommonsLibrary.RestartableThread; import ru.simsonic.rscMinecraftLibrary.Bukkit.CommandAnswerException; import ru.simsonic.rscMinecraftLibrary.Bukkit.GenericChatCodes; +import ru.simsonic.rscMinecraftLibrary.Bukkit.Tools; import ru.simsonic.rscPermissions.API.Settings; import ru.simsonic.rscPermissions.Bukkit.BukkitDatabaseFetcher; import ru.simsonic.rscPermissions.BukkitPluginMain; @@ -88,10 +89,7 @@ public class BukkitCommands public void onCommandHub(CommandSender sender, String[] args) throws CommandAnswerException { final ArrayList help = new ArrayList<>(64); - help.add("{_WH}" + rscp.getDescription().getName() + " v" + rscp.getDescription().getVersion() - + " © " + rscp.getDescription().getAuthors().get(0)); - help.add(Phrases.HELP_HEADER_1.toString()); - help.add("{_LB}{_U}" + rscp.getDescription().getWebsite()); + help.addAll(Tools.getPluginWelcome(rscp, Phrases.HELP_HEADER_1.toString())); if(args.length == 0) throw new CommandAnswerException(help); help.add(Phrases.HELP_HEADER_2.toString().replace("{SERVER-ID}", rscp.getServer().getServerId())); diff --git a/src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java b/src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java index 90f553f..d26781b 100644 --- a/src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java +++ b/src/main/java/ru/simsonic/rscPermissions/BukkitPluginMain.java @@ -145,13 +145,8 @@ public final class BukkitPluginMain extends JavaPlugin break; } } catch(CommandAnswerException ex) { - final boolean decolorize = Settings.decolorizeForConsole && sender instanceof ConsoleCommandSender; for(String answer : ex.getMessageArray()) - { - answer = GenericChatCodes.processStringStatic(Settings.chatPrefix + answer); - final String textToSend = decolorize ? org.bukkit.ChatColor.stripColor(answer) : answer; - sender.sendMessage(textToSend); - } + sender.sendMessage(GenericChatCodes.processStringStatic(Settings.chatPrefix + answer)); } return true; }