From 1e6a7de7fbb884b962214cc69151733b739d3cdb Mon Sep 17 00:00:00 2001
From: Nathan Blaney <nathan@blaney.xyz>
Date: Wed, 12 Jun 2024 20:54:36 +1000
Subject: [PATCH] Add flag to enable/disable the Admin MOTD

---
 .../src/main/java/org/royaldev/royalcommands/Config.java      | 4 +++-
 .../org/royaldev/royalcommands/listeners/PlayerListener.java  | 2 +-
 .../royaldev/royalcommands/rcommands/CmdMessageOfTheDay.java  | 2 +-
 modules/RoyalCommands/src/main/resources/config.yml           | 4 +++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/RoyalCommands/src/main/java/org/royaldev/royalcommands/Config.java b/modules/RoyalCommands/src/main/java/org/royaldev/royalcommands/Config.java
index f95ef133..307c43bd 100644
--- a/modules/RoyalCommands/src/main/java/org/royaldev/royalcommands/Config.java
+++ b/modules/RoyalCommands/src/main/java/org/royaldev/royalcommands/Config.java
@@ -63,6 +63,7 @@ public class Config {
     public static boolean timeBroadcast;
     public static boolean updateCheck;
     public static boolean updateOldUserdata;
+    public static boolean useAdminMotd;
     public static boolean useFirstJoinMotd;
     public static boolean useProtocolLib;
     public static boolean useVNP;
@@ -224,7 +225,8 @@ public void reloadConfiguration() {
         timeBroadcast = c.getBoolean("messages.options.broadcast_time_changes", false);
         updateCheck = c.getBoolean("updates.update_check", false);
         updateOldUserdata = c.getBoolean("userdata.update_old", true);
-        useFirstJoinMotd = c.getBoolean("motd.options.use_first_join", true);
+        useAdminMotd = c.getBoolean("motd.options.use_first_join_motd", true);
+        useFirstJoinMotd = c.getBoolean("motd.options.use_first_join_motd", true);
         useProtocolLib = c.getBoolean("items.spawn.tag.plugins.protocollib", true);
         useVNP = c.getBoolean("plugins.use_vanish", true);
         useWelcome = c.getBoolean("messages.options.enable_welcome_message", true);
diff --git a/modules/RoyalCommands/src/main/java/org/royaldev/royalcommands/listeners/PlayerListener.java b/modules/RoyalCommands/src/main/java/org/royaldev/royalcommands/listeners/PlayerListener.java
index 48092aa4..685c9c51 100755
--- a/modules/RoyalCommands/src/main/java/org/royaldev/royalcommands/listeners/PlayerListener.java
+++ b/modules/RoyalCommands/src/main/java/org/royaldev/royalcommands/listeners/PlayerListener.java
@@ -581,7 +581,7 @@ public void showMotd(PlayerJoinEvent e) {
         List<String> motdConfig;
         if (Config.useFirstJoinMotd && !p.hasPlayedBefore()) {
             motdConfig = Config.motdFirstJoin;
-        } else if (plugin.ah.isAuthorized(p, "rcmds.messageoftheday.admin")) {
+        } else if (Config.useAdminMotd && plugin.ah.isAuthorized(p, "rcmds.messageoftheday.admin")) {
             motdConfig = Config.motdAdmin;
         } else {
             motdConfig = Config.motdGeneral;
diff --git a/modules/RoyalCommands/src/main/java/org/royaldev/royalcommands/rcommands/CmdMessageOfTheDay.java b/modules/RoyalCommands/src/main/java/org/royaldev/royalcommands/rcommands/CmdMessageOfTheDay.java
index 0d8a86d4..06a7ee17 100644
--- a/modules/RoyalCommands/src/main/java/org/royaldev/royalcommands/rcommands/CmdMessageOfTheDay.java
+++ b/modules/RoyalCommands/src/main/java/org/royaldev/royalcommands/rcommands/CmdMessageOfTheDay.java
@@ -66,7 +66,7 @@ public static void showMotd(CommandSender cs, List<String> config) {
     @Override
     public boolean runCommand(final CommandSender cs, final Command cmd, final String label, final String[] args, CommandArguments ca) {
         List<String> config;
-        if (ah.isAuthorized(cs, "rcmds.messageoftheday.admin")) {
+        if (Config.useAdminMotd && ah.isAuthorized(cs, "rcmds.messageoftheday.admin")) {
             config = Config.motdAdmin;
         } else {
             config = Config.motdGeneral;
diff --git a/modules/RoyalCommands/src/main/resources/config.yml b/modules/RoyalCommands/src/main/resources/config.yml
index 2c529170..cc3645ab 100644
--- a/modules/RoyalCommands/src/main/resources/config.yml
+++ b/modules/RoyalCommands/src/main/resources/config.yml
@@ -204,7 +204,9 @@ motd:
     # Show /motd on login?
     display_on_login: true
     # Show different motd on first join
-    use_first_join: true
+    use_first_join_motd: true
+    # Show different motd for admin
+    use_admin_motd: true
   # The message of the day
   general:
     - "&dWelcome to {servername}, {dispname}!"