From 299355d69e403584da33877c55f204cd22533122 Mon Sep 17 00:00:00 2001 From: Asleeepp Date: Tue, 11 Jun 2024 15:02:39 -0300 Subject: [PATCH] Suggested --- src/main/java/ch/njol/skript/SkriptCommand.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/ch/njol/skript/SkriptCommand.java b/src/main/java/ch/njol/skript/SkriptCommand.java index c9dee8d2fcc..8cec435852a 100644 --- a/src/main/java/ch/njol/skript/SkriptCommand.java +++ b/src/main/java/ch/njol/skript/SkriptCommand.java @@ -25,7 +25,6 @@ import ch.njol.skript.localization.ArgsMessage; import ch.njol.skript.localization.Language; import ch.njol.skript.localization.PluralizingArgsMessage; -import ch.njol.skript.log.LogHandler; import ch.njol.skript.log.RedirectingLogHandler; import ch.njol.skript.log.SkriptLogger; import ch.njol.skript.log.TimingLogHandler; @@ -115,7 +114,6 @@ private static void reloaded(CommandSender sender, RedirectingLogHandler logHand String timeTaken = String.valueOf(timingLogHandler.getTimeTaken()); String message; - String errorDetails = null; if (logHandler.numErrors() == 0) { message = StringUtils.fixCapitalization(PluralizingArgsMessage.format(m_reloaded.toString(what, timeTaken))); Skript.info(sender, message); @@ -130,12 +128,12 @@ private static void reloaded(CommandSender sender, RedirectingLogHandler logHand private static void info(CommandSender sender, String what, Object... args) { - what = args.length == 0 ? Language.get(CONFIG_NODE + "." + what) : format(Language.format(CONFIG_NODE + "." + what, args)); + what = args.length == 0 ? Language.get(CONFIG_NODE + "." + what) : PluralizingArgsMessage.format(Language.format(CONFIG_NODE + "." + what, args)); Skript.info(sender, StringUtils.fixCapitalization(what)); } private static void error(CommandSender sender, String what, Object... args) { - what = args.length == 0 ? Language.get(CONFIG_NODE + "." + what) : format(Language.format(CONFIG_NODE + "." + what, args)); + what = args.length == 0 ? Language.get(CONFIG_NODE + "." + what) : PluralizingArgsMessage.format(Language.format(CONFIG_NODE + "." + what, args)); Skript.error(sender, StringUtils.fixCapitalization(what)); } @@ -532,10 +530,14 @@ private static Set toggleFiles(File folder, boolean enable) throws IOExcep return changed; } + /** + * Sends the Skript reloading message to operators and console, requires a {@link RedirectingLogHandler} and {@link CommandSender}. + */ + private static void notifyOperators(String message, CommandSender sender, RedirectingLogHandler logHandler) { if (SkriptConfig.sendReloadingInfoToOps.value()) { Bukkit.getOnlinePlayers().stream() - .filter(player -> player.isOp() && player.hasPermission("skript.reloadnotify") && !player.equals(sender)) + .filter(player -> player.hasPermission("skript.reloadnotify") && !player.equals(sender)) .forEach(player -> { if (logHandler.numErrors() == 0) { Skript.info(player, message); @@ -547,7 +549,7 @@ private static void notifyOperators(String message, CommandSender sender, Redire } }); - // Send the message to the console if the boolean is false + // send to console if (logHandler.numErrors() == 0) { Skript.info(Bukkit.getConsoleSender(), message); } else {