diff --git a/SimpleStaffChat-Bungee/pom.xml b/SimpleStaffChat-Bungee/pom.xml index 36372f2..6b90e1e 100644 --- a/SimpleStaffChat-Bungee/pom.xml +++ b/SimpleStaffChat-Bungee/pom.xml @@ -6,7 +6,7 @@ me.refracdevelopment SimpleStaffChat - 4.3.2 + 4.3.3 4.0.0 diff --git a/SimpleStaffChat-Bungee/src/main/java/me/refracdevelopment/simplestaffchat/listeners/JoinListener.java b/SimpleStaffChat-Bungee/src/main/java/me/refracdevelopment/simplestaffchat/listeners/JoinListener.java index fae265e..9c14877 100644 --- a/SimpleStaffChat-Bungee/src/main/java/me/refracdevelopment/simplestaffchat/listeners/JoinListener.java +++ b/SimpleStaffChat-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 index cd88ede..a95b85d 100644 --- a/SimpleStaffChat-Spigot/pom.xml +++ b/SimpleStaffChat-Spigot/pom.xml @@ -6,7 +6,7 @@ me.refracdevelopment SimpleStaffChat - 4.3.2 + 4.3.3 4.0.0 diff --git a/SimpleStaffChat-Spigot/src/main/java/me/refracdevelopment/simplestaffchat/listeners/JoinListener.java b/SimpleStaffChat-Spigot/src/main/java/me/refracdevelopment/simplestaffchat/listeners/JoinListener.java index 0feed93..40aab82 100644 --- a/SimpleStaffChat-Spigot/src/main/java/me/refracdevelopment/simplestaffchat/listeners/JoinListener.java +++ b/SimpleStaffChat-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 index 3b3fab8..8ec5096 100644 --- a/SimpleStaffChat-Velocity/pom.xml +++ b/SimpleStaffChat-Velocity/pom.xml @@ -6,7 +6,7 @@ me.refracdevelopment SimpleStaffChat - 4.3.2 + 4.3.3 4.0.0 diff --git a/pom.xml b/pom.xml index 218e083..668332e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ me.refracdevelopment SimpleStaffChat - 4.3.2 + 4.3.3 pom SimpleStaffChat