[功能] 添加隐藏自动登录时发送登录成功消息

src/main/java/fr/xephi/authme/command/executable/totp/TotpCodeCommand.java

@@ -70,7 +70,7 @@ public class TotpCodeCommand extends PlayerCommand {
         boolean isCodeValid = totpAuthenticator.checkCode(auth, inputCode);
         if (isCodeValid) {
             logger.debug("Successfully checked TOTP code for `{0}`", player.getName());
-            asynchronousLogin.performLogin(player, auth);
+            asynchronousLogin.performLogin(player, auth,false);
         } else {
             logger.debug("Input TOTP code was invalid for player `{0}`", player.getName());
             messages.send(player, MessageKey.TWO_FACTOR_INVALID_CODE);

src/main/java/fr/xephi/authme/message/MessageKey.java

@@ -35,9 +35,6 @@ public enum MessageKey {
     /** In-game registration is disabled! */
     REGISTRATION_DISABLED("registration.disabled"),
 
-    /** Logged-in due to Session Reconnection. */
-    SESSION_RECONNECTION("session.valid_session"),
-
     /** Successful login! */
     LOGIN_SUCCESS("login.success"),
 

src/main/java/fr/xephi/authme/message/updater/OldMessageKeysMigrater.java

@@ -30,7 +30,6 @@ final class OldMessageKeysMigrater {
         .put(MessageKey.WRONG_PASSWORD, "wrong_pwd")
         .put(MessageKey.UNREGISTERED_SUCCESS, "unregistered")
         .put(MessageKey.REGISTRATION_DISABLED, "reg_disabled")
-        .put(MessageKey.SESSION_RECONNECTION, "valid_session")
         .put(MessageKey.ACCOUNT_NOT_ACTIVATED, "vb_nonActiv")
         .put(MessageKey.NAME_ALREADY_REGISTERED, "user_regged")
         .put(MessageKey.NO_PERMISSION, "no_perm")

src/main/java/fr/xephi/authme/process/Management.java

@@ -54,7 +54,7 @@ public class Management {
     }
 
     public void forceLogin(Player player) {
-        runTask(() -> asynchronousLogin.forceLogin(player));
+        runTask(() -> asynchronousLogin.forceLogin(player,0));
     }
 
     public void forceLogin(Player player, boolean quiet) {

src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java

@@ -19,6 +19,7 @@ import fr.xephi.authme.service.bungeecord.BungeeSender;
 import fr.xephi.authme.service.bungeecord.MessageType;
 import fr.xephi.authme.settings.commandconfig.CommandManager;
 import fr.xephi.authme.settings.properties.HooksSettings;
+import fr.xephi.authme.settings.properties.PluginSettings;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
 import fr.xephi.authme.util.InternetProtocolUtils;
@@ -128,18 +129,16 @@ public class AsynchronousJoin implements AsynchronousProcess {
 
             // Session logic
             if (sessionService.canResumeSession(player)) {
-                service.send(player, MessageKey.SESSION_RECONNECTION);
                 // Run commands
                 bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(
                     () -> commandManager.runCommandsOnSessionLogin(player));
-                bukkitService.runTaskOptionallyAsync(() -> asynchronousLogin.forceLogin(player));
+                bukkitService.runTaskOptionallyAsync(() -> asynchronousLogin.forceLogin(player,service.getProperty(PluginSettings.HIDE_SESSIONS_LOGIN) ? 1 : 0));
                 return;
             } else if (proxySessionManager.shouldResumeSession(name)) {
-                service.send(player, MessageKey.SESSION_RECONNECTION);
                 // Run commands
                 bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(
                     () -> commandManager.runCommandsOnSessionLogin(player));
-                bukkitService.runTaskOptionallyAsync(() -> asynchronousLogin.forceLogin(player));
+                bukkitService.runTaskOptionallyAsync(() -> asynchronousLogin.forceLogin(player,service.getProperty(PluginSettings.HIDE_SESSIONS_LOGIN) ? 1 : 0));
                 logger.info("The user " + player.getName() + " has been automatically logged in, "
                     + "as present in autologin queue.");
                 return;

src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java

@@ -102,7 +102,7 @@ public class AsynchronousLogin implements AsynchronousProcess {
                 limboService.getLimboPlayer(player.getName()).setState(LimboPlayerState.TOTP_REQUIRED);
                 // TODO #1141: Check if we should check limbo state before processing password
             } else {
-                performLogin(player, auth);
+                performLogin(player, auth, false);
             }
         }
     }
@@ -112,10 +112,10 @@ public class AsynchronousLogin implements AsynchronousProcess {
      *
      * @param player the player to log in
      */
-    public void forceLogin(Player player) {
+    public void forceLogin(Player player,int quiet) {
         PlayerAuth auth = getPlayerAuth(player);
         if (auth != null) {
-            performLogin(player, auth);
+            performLogin(player, auth, quiet == 1);
         }
     }
 
@@ -128,7 +128,7 @@ public class AsynchronousLogin implements AsynchronousProcess {
     public void forceLogin(Player player, boolean quiet) {
         PlayerAuth auth = getPlayerAuth(player, quiet);
         if (auth != null) {
-            performLogin(player, auth);
+            performLogin(player, auth, false);
         }
     }
 
@@ -265,7 +265,7 @@ public class AsynchronousLogin implements AsynchronousProcess {
      * @param player the player to log in
      * @param auth the associated PlayerAuth object
      */
-    public void performLogin(Player player, PlayerAuth auth) {
+    public void performLogin(Player player, PlayerAuth auth, boolean quiet) {
         if (player.isOnline()) {
             boolean isFirstLogin = (auth.getLastLogin() == null);
 
@@ -284,7 +284,7 @@ public class AsynchronousLogin implements AsynchronousProcess {
             tempbanManager.resetCount(ip, name);
             player.setNoDamageTicks(0);
 
-            service.send(player, MessageKey.LOGIN_SUCCESS);
+            if (!quiet) {service.send(player, MessageKey.LOGIN_SUCCESS);}
 
             // Other auths
             List<String> auths = dataSource.getAllAuthsByIp(auth.getLastIp());

src/main/java/fr/xephi/authme/process/register/executors/AbstractPasswordRegisterExecutor.java

@@ -89,9 +89,9 @@ abstract class AbstractPasswordRegisterExecutor<P extends AbstractPasswordRegist
         final Player player = params.getPlayer();
         if (performLoginAfterRegister(params)) {
             if (commonService.getProperty(PluginSettings.USE_ASYNC_TASKS)) {
-                bukkitService.runTaskAsynchronously(() -> asynchronousLogin.forceLogin(player));
+                bukkitService.runTaskAsynchronously(() -> asynchronousLogin.forceLogin(player,0));
             } else {
-                bukkitService.scheduleSyncDelayedTask(() -> asynchronousLogin.forceLogin(player), SYNC_LOGIN_DELAY);
+                bukkitService.scheduleSyncDelayedTask(() -> asynchronousLogin.forceLogin(player,0), SYNC_LOGIN_DELAY);
             }
         }
         syncProcessManager.processSyncPasswordRegister(player);

src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java

@@ -20,6 +20,12 @@ public final class PluginSettings implements SettingsHolder {
     public static final Property<Boolean> SESSIONS_ENABLED =
         newProperty("settings.sessions.enabled", true);
 
+    @Comment({
+        "Do you want to hide login success message to player?"
+    })
+    public static final Property<Boolean> HIDE_SESSIONS_LOGIN =
+        newProperty("settings.sessions.hidelogin", true);
+
     @Comment({
         "After how many minutes should a session expire?",
         "A player's session ends after the timeout or if his IP has changed"