Skip to content

Commit

Permalink
Suggested
Browse files Browse the repository at this point in the history
  • Loading branch information
Asleeepp committed Jun 11, 2024
1 parent e522450 commit 299355d
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions src/main/java/ch/njol/skript/SkriptCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -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));
}

Expand Down Expand Up @@ -532,10 +530,14 @@ private static Set<File> 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);
Expand All @@ -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 {
Expand Down

0 comments on commit 299355d

Please sign in to comment.