From 2433ef5db74aa85c46495b175a5d290e240db5ec Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Sat, 18 May 2019 10:47:37 -0700
Subject: [PATCH] Move admin notification toggle check

---
 .../java/com/gmail/nossr50/commands/XprateCommand.java    | 1 +
 .../gmail/nossr50/util/player/NotificationManager.java    | 8 ++++----
 src/main/resources/locale/locale_en_US.properties         | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/commands/XprateCommand.java b/src/main/java/com/gmail/nossr50/commands/XprateCommand.java
index d7471e47c..62e9cdc59 100644
--- a/src/main/java/com/gmail/nossr50/commands/XprateCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/XprateCommand.java
@@ -53,6 +53,7 @@ public class XprateCommand implements TabExecutor {
                         mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.Event.Stop.Subtitle"));
                     }
 
+                    //Admin notification
                     NotificationManager.processSensitiveCommandNotification(sender, SensitiveCommandType.XPRATE_END);
 
                     mcMMO.p.toggleXpEventEnabled();
diff --git a/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java b/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java
index 546fb88e9..94141185c 100644
--- a/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java
+++ b/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java
@@ -167,6 +167,10 @@ public class NotificationManager {
      * @param msg message fetched from locale
      */
     private static void sendAdminNotification(String msg) {
+        //If its not enabled exit
+        if(!Config.getInstance().adminNotifications())
+            return;
+
         for(Player player : Bukkit.getServer().getOnlinePlayers())
         {
             if(player.isOp() || Permissions.adminChat(player))
@@ -194,10 +198,6 @@ public class NotificationManager {
      * @param sensitiveCommandType type of command issued
      */
     public static void processSensitiveCommandNotification(CommandSender commandSender, SensitiveCommandType sensitiveCommandType, String... args) {
-        //If its not enabled exit
-        if(!Config.getInstance().adminNotifications())
-            return;
-
         /*
          * Determine the 'identity' of the one who executed the command to pass as a parameters
          */
diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties
index 79147bc69..60960db06 100644
--- a/src/main/resources/locale/locale_en_US.properties
+++ b/src/main/resources/locale/locale_en_US.properties
@@ -828,7 +828,7 @@ Commands.xprate.started.0=[[GOLD]]XP EVENT FOR mcMMO HAS STARTED!
 Commands.xprate.started.1=[[GOLD]]mcMMO XP RATE IS NOW {0}x!
 
 # Admin Notifications
-Server.ConsoleName=[Server]
+Server.ConsoleName=[[YELLOW]][Server]
 Notifications.Admin.XPRate.Start.Self=[[GRAY]]You have set the global XP rate multiplier to [[GOLD]]{0}x
 Notifications.Admin.XPRate.End.Self=[[GRAY]]You ended the XP rate event.
 Notifications.Admin.XPRate.End.Others=The user {0} [[GRAY]]has ended the XP rate event