Fix %player% placeholder issues

RefracDevelopment · Jun 10, 2024 · 568fe29 · 568fe29
1 parent 3347af7
commit 568fe29
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 8 deletions.
diff --git a/SimpleStaffChat-Bungee/pom.xml b/SimpleStaffChat-Bungee/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>me.refracdevelopment</groupId>
         <artifactId>SimpleStaffChat</artifactId>
-        <version>4.3.2</version>
+        <version>4.3.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/...hat-Bungee/src/main/java/me/refracdevelopment/simplestaffchat/listeners/JoinListener.java b/...hat-Bungee/src/main/java/me/refracdevelopment/simplestaffchat/listeners/JoinListener.java
@@ -42,9 +42,11 @@ public void onJoin(ServerConnectEvent event) {
             return;
 
         RyMessageUtils.broadcast(player, Permissions.STAFFCHAT_SEE, plugin.getConfig().JOIN_FORMAT
+                .replace("%player%", player.getName())
                 .replace("%server%", event.getTarget().getName()));
 
         RyMessageUtils.sendConsole(true, plugin.getConfig().JOIN_FORMAT
+                .replace("%player%", player.getName())
                 .replace("%server%", event.getTarget().getName()));
 
         DiscordImpl.sendJoin(JoinType.JOIN, player, event.getTarget().getName(), "");
@@ -61,10 +63,12 @@ public void onSwitch(ServerSwitchEvent event) {
             return;
 
         RyMessageUtils.broadcast(player, Permissions.STAFFCHAT_SEE, plugin.getConfig().SWITCH_FORMAT
+                .replace("%player%", player.getName())
                 .replace("%server%", player.getServer().getInfo().getName())
                 .replace("%from%", event.getFrom().getName()));
 
         RyMessageUtils.sendConsole(true, plugin.getConfig().SWITCH_FORMAT
+                .replace("%player%", player.getName())
                 .replace("%server%", player.getServer().getInfo().getName())
                 .replace("%from%", event.getFrom().getName()));
 
@@ -81,10 +85,13 @@ public void onQuit(PlayerDisconnectEvent event) {
             return;
 
         RyMessageUtils.broadcast(player, Permissions.STAFFCHAT_SEE, plugin.getConfig().QUIT_FORMAT
+                .replace("%player%", player.getName())
                 .replace("%server%", player.getServer().getInfo().getName()));
 
         RyMessageUtils.sendConsole(true, plugin.getConfig().QUIT_FORMAT
+                .replace("%player%", player.getName())
                 .replace("%server%", player.getServer().getInfo().getName()));
+
         DiscordImpl.sendJoin(JoinType.LEAVE, player, player.getServer().getInfo().getName(), "");
     }
 

diff --git a/SimpleStaffChat-Spigot/pom.xml b/SimpleStaffChat-Spigot/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>me.refracdevelopment</groupId>
         <artifactId>SimpleStaffChat</artifactId>
-        <version>4.3.2</version>
+        <version>4.3.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/...hat-Spigot/src/main/java/me/refracdevelopment/simplestaffchat/listeners/JoinListener.java b/...hat-Spigot/src/main/java/me/refracdevelopment/simplestaffchat/listeners/JoinListener.java
@@ -39,9 +39,14 @@ public void onJoin(PlayerJoinEvent event) {
         if (!player.hasPermission(Permissions.STAFFCHAT_JOIN))
             return;
 
-        RyMessageUtils.sendStaffChat(player, Permissions.STAFFCHAT_SEE, this.plugin.getSettings().JOIN_FORMAT);
+        RyMessageUtils.sendStaffChat(player, Permissions.STAFFCHAT_SEE, this.plugin.getSettings().JOIN_FORMAT
+                .replace("%player%", player.getName())
+        );
+
+        RyMessageUtils.sendConsole(true, this.plugin.getSettings().JOIN_FORMAT
+                .replace("%player%", player.getName())
+        );
 
-        RyMessageUtils.sendConsole(true, this.plugin.getSettings().JOIN_FORMAT);
         DiscordImpl.sendJoin(JoinType.JOIN, player);
     }
 
@@ -52,9 +57,14 @@ public void onQuit(PlayerQuitEvent event) {
         if (!player.hasPermission(Permissions.STAFFCHAT_QUIT))
             return;
 
-        RyMessageUtils.sendStaffChat(player, Permissions.STAFFCHAT_SEE, this.plugin.getSettings().QUIT_FORMAT);
+        RyMessageUtils.sendStaffChat(player, Permissions.STAFFCHAT_SEE, this.plugin.getSettings().QUIT_FORMAT
+                .replace("%player%", player.getName())
+        );
+
+        RyMessageUtils.sendConsole(true, this.plugin.getSettings().QUIT_FORMAT
+                .replace("%player%", player.getName())
+        );
 
-        RyMessageUtils.sendConsole(true, this.plugin.getSettings().QUIT_FORMAT);
         DiscordImpl.sendJoin(JoinType.LEAVE, player);
     }
 

diff --git a/SimpleStaffChat-Velocity/pom.xml b/SimpleStaffChat-Velocity/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>me.refracdevelopment</groupId>
         <artifactId>SimpleStaffChat</artifactId>
-        <version>4.3.2</version>
+        <version>4.3.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.refracdevelopment</groupId>
     <artifactId>SimpleStaffChat</artifactId>
-    <version>4.3.2</version>
+    <version>4.3.3</version>
     <packaging>pom</packaging>
 
     <name>SimpleStaffChat</name>