From c38e2aba281e0799050c3a99a69d782d7bf10d0e Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Thu, 18 Aug 2022 03:41:31 +0200 Subject: [PATCH] Fix bungee message order (login -> connect) --- .../java/fr/xephi/authme/process/join/AsynchronousJoin.java | 2 +- .../java/fr/xephi/authme/process/login/AsynchronousLogin.java | 2 +- .../java/fr/xephi/authme/service/bungeecord/BungeeSender.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java b/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java index 160e125c..725faa83 100644 --- a/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java +++ b/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java @@ -158,7 +158,7 @@ public class AsynchronousJoin implements AsynchronousProcess { // As described at https://www.spigotmc.org/wiki/bukkit-bungee-plugin-messaging-channel/ // "Keep in mind that you can't send plugin messages directly after a player joins." bukkitService.scheduleSyncDelayedTask(() -> - bungeeSender.sendAuthMeBungeecordMessage(player, MessageType.LOGIN), 10L); + bungeeSender.sendAuthMeBungeecordMessage(player, MessageType.LOGIN), 5L); } return; } diff --git a/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java b/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java index e465803c..4b86a567 100644 --- a/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java +++ b/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java @@ -305,7 +305,7 @@ public class AsynchronousLogin implements AsynchronousProcess { // As described at https://www.spigotmc.org/wiki/bukkit-bungee-plugin-messaging-channel/ // "Keep in mind that you can't send plugin messages directly after a player joins." bukkitService.scheduleSyncDelayedTask(() -> - bungeeSender.sendAuthMeBungeecordMessage(player, MessageType.LOGIN), 10L); + bungeeSender.sendAuthMeBungeecordMessage(player, MessageType.LOGIN), 5L); } // As the scheduling executes the Task most likely after the current diff --git a/src/main/java/fr/xephi/authme/service/bungeecord/BungeeSender.java b/src/main/java/fr/xephi/authme/service/bungeecord/BungeeSender.java index 68edfcf2..d4a9f7ef 100644 --- a/src/main/java/fr/xephi/authme/service/bungeecord/BungeeSender.java +++ b/src/main/java/fr/xephi/authme/service/bungeecord/BungeeSender.java @@ -85,7 +85,7 @@ public class BungeeSender implements SettingsDependent { } // Add a small delay, just in case... bukkitService.scheduleSyncDelayedTask(() -> - sendBungeecordMessage(player, "Connect", destinationServerOnLogin), 5L); + sendBungeecordMessage(player, "Connect", destinationServerOnLogin), 10L); } /**