From b65ffd7c741e783168ba36c56cf85b4142e632a3 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Thu, 18 Aug 2022 02:04:08 +0200 Subject: [PATCH] Send logout message to bungee on self-unregister --- .../command/executable/unregister/UnregisterCommand.java | 2 +- .../authme/process/unregister/AsynchronousUnregister.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/fr/xephi/authme/command/executable/unregister/UnregisterCommand.java b/src/main/java/fr/xephi/authme/command/executable/unregister/UnregisterCommand.java index 91088f1b..21993f38 100644 --- a/src/main/java/fr/xephi/authme/command/executable/unregister/UnregisterCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/unregister/UnregisterCommand.java @@ -31,7 +31,7 @@ public class UnregisterCommand extends PlayerCommand { @Override public void runCommand(Player player, List arguments) { String playerPass = arguments.get(0); - final String playerName = player.getName(); + String playerName = player.getName(); // Make sure the player is authenticated if (!playerCache.isAuthenticated(playerName)) { diff --git a/src/main/java/fr/xephi/authme/process/unregister/AsynchronousUnregister.java b/src/main/java/fr/xephi/authme/process/unregister/AsynchronousUnregister.java index 623c93ac..7beea4be 100644 --- a/src/main/java/fr/xephi/authme/process/unregister/AsynchronousUnregister.java +++ b/src/main/java/fr/xephi/authme/process/unregister/AsynchronousUnregister.java @@ -14,9 +14,11 @@ import fr.xephi.authme.security.PasswordSecurity; import fr.xephi.authme.service.BukkitService; import fr.xephi.authme.service.CommonService; import fr.xephi.authme.service.TeleportationService; +import fr.xephi.authme.service.bungeecord.MessageType; import fr.xephi.authme.settings.commandconfig.CommandManager; import fr.xephi.authme.settings.properties.RegistrationSettings; import fr.xephi.authme.settings.properties.RestrictionSettings; +import fr.xephi.authme.service.bungeecord.BungeeSender; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.potion.PotionEffect; @@ -54,6 +56,9 @@ public class AsynchronousUnregister implements AsynchronousProcess { @Inject private CommandManager commandManager; + @Inject + private BungeeSender bungeeSender; + AsynchronousUnregister() { } @@ -112,6 +117,9 @@ public class AsynchronousUnregister implements AsynchronousProcess { * @param player the according Player object (nullable) */ private void performPostUnregisterActions(String name, Player player) { + if (player != null && playerCache.isAuthenticated(name)) { + bungeeSender.sendAuthMeBungeecordMessage(player, MessageType.LOGOUT); + } playerCache.removePlayer(name); // TODO: send an update when a messaging service will be implemented (UNREGISTER)