From 9e6b42fe5937001d1e97d67d988b4656c23e42a6 Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Wed, 8 Jul 2026 22:17:41 -0400
Subject: [PATCH] Resolves #83

---
 .../command/impl/RemoveLoginMessageCMD.java   |  2 +
 .../plex/command/impl/SetLoginMessageCMD.java | 60 +++++++++----------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/server/src/main/java/dev/plex/command/impl/RemoveLoginMessageCMD.java b/server/src/main/java/dev/plex/command/impl/RemoveLoginMessageCMD.java
index a913ea4..7dcf5a4 100644
--- a/server/src/main/java/dev/plex/command/impl/RemoveLoginMessageCMD.java
+++ b/server/src/main/java/dev/plex/command/impl/RemoveLoginMessageCMD.java
@@ -47,6 +47,7 @@ public class RemoveLoginMessageCMD extends ServerCommand
             {
                 PlexPlayer plexPlayer = plugin.getPlayerCache().getPlexPlayer(playerSender.getUniqueId());
                 plexPlayer.setLoginMessage("");
+                plugin.getPlayerService().update(plexPlayer);
                 return context.messageComponent("removedOwnLoginMessage");
             }
         }
@@ -65,6 +66,7 @@ public class RemoveLoginMessageCMD extends ServerCommand
                 return context.messageComponent("playerNotFound");
             }
             plexPlayer.setLoginMessage("");
+            plugin.getPlayerService().update(plexPlayer);
             return context.messageComponent("removedOtherLoginMessage", plexPlayer.getName());
         }
         else
diff --git a/server/src/main/java/dev/plex/command/impl/SetLoginMessageCMD.java b/server/src/main/java/dev/plex/command/impl/SetLoginMessageCMD.java
index 723dcfa..23926cc 100644
--- a/server/src/main/java/dev/plex/command/impl/SetLoginMessageCMD.java
+++ b/server/src/main/java/dev/plex/command/impl/SetLoginMessageCMD.java
@@ -74,44 +74,42 @@ public class SetLoginMessageCMD extends ServerCommand
         {
             return context.usage();
         }
-        if (playerSender != null)
+        if (args[0].equals("-o"))
         {
-            if (args[0].equals("-o"))
-            {
-                context.checkPermission(sender, "plex.setloginmessage.others");
+            context.checkPermission(sender, "plex.setloginmessage.others");
 
-                if (args.length < 2)
-                {
-                    return context.messageComponent("specifyPlayer");
-                }
-                if (args.length < 3)
-                {
-                    return context.messageComponent("specifyLoginMessage");
-                }
-                PlexPlayer plexPlayer = plugin.getPlayerService().getPlayer(args[1]);
-                if (plexPlayer == null)
-                {
-                    return context.messageComponent("playerNotFound");
-                }
-                String message = StringUtils.join(args, " ", 2, args.length);
-                message = message.replace(plexPlayer.getName(), "%player%");
-                validateMessage(context, message);
-                plexPlayer.setLoginMessage(message);
-                return context.messageComponent("setOtherPlayersLoginMessage", plexPlayer.getName(),
-                        MiniMessage.miniMessage().serialize(PlexUtils.stringToComponent(message.replace("%player%", plexPlayer.getName()))));
-            }
-            if (context.isConsole(sender))
+            if (args.length < 2)
             {
-                return context.messageComponent("noPermissionConsole");
+                return context.messageComponent("specifyPlayer");
             }
-            PlexPlayer plexPlayer = plugin.getPlayerCache().getPlexPlayer(playerSender.getUniqueId());
-            String message = StringUtils.join(args, " ", 0, args.length)
-                    .replace(plexPlayer.getName(), "%player%");
+            if (args.length < 3)
+            {
+                return context.messageComponent("specifyLoginMessage");
+            }
+            PlexPlayer plexPlayer = plugin.getPlayerService().getPlayer(args[1]);
+            if (plexPlayer == null)
+            {
+                return context.messageComponent("playerNotFound");
+            }
+            String message = StringUtils.join(args, " ", 2, args.length);
+            message = message.replace(plexPlayer.getName(), "%player%");
             validateMessage(context, message);
             plexPlayer.setLoginMessage(message);
-            return context.messageComponent("setOwnLoginMessage", PlexUtils.stringToComponent(message.replace("%player%", plexPlayer.getName())));
+            plugin.getPlayerService().update(plexPlayer);
+            return context.messageComponent("setOtherPlayersLoginMessage", plexPlayer.getName(),
+                    MiniMessage.miniMessage().serialize(PlexUtils.stringToComponent(message.replace("%player%", plexPlayer.getName()))));
         }
-        return null;
+        if (context.isConsole(sender))
+        {
+            return context.messageComponent("noPermissionConsole");
+        }
+        PlexPlayer plexPlayer = plugin.getPlayerCache().getPlexPlayer(playerSender.getUniqueId());
+        String message = StringUtils.join(args, " ", 0, args.length)
+                .replace(plexPlayer.getName(), "%player%");
+        validateMessage(context, message);
+        plexPlayer.setLoginMessage(message);
+        plugin.getPlayerService().update(plexPlayer);
+        return context.messageComponent("setOwnLoginMessage", PlexUtils.stringToComponent(message.replace("%player%", plexPlayer.getName())));
     }
 
     private void validateMessage(ServerCommandContext context, String message)