From 077cb242f0df36bbaa28386abc473bc89671c869 Mon Sep 17 00:00:00 2001
From: ljacqu <ljacqu@users.noreply.github.com>
Date: Fri, 29 Apr 2016 21:16:42 +0200
Subject: [PATCH] #550 Show welcome message only after login - Never send
 welcome message just after registration (with no subsequent login) - Always
 run force command options upon registration

---
 .../register/ProcessSyncPasswordRegister.java | 28 +++++++------------
 .../properties/RegistrationSettings.java      |  2 +-
 src/main/resources/config.yml                 | 10 +++----
 3 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/process/register/ProcessSyncPasswordRegister.java b/src/main/java/fr/xephi/authme/process/register/ProcessSyncPasswordRegister.java
index 84288822d..b9505143e 100644
--- a/src/main/java/fr/xephi/authme/process/register/ProcessSyncPasswordRegister.java
+++ b/src/main/java/fr/xephi/authme/process/register/ProcessSyncPasswordRegister.java
@@ -63,7 +63,12 @@ public class ProcessSyncPasswordRegister implements Process {
         }
     }
 
-    private void forceLogin(Player player) {
+    /**
+     * Request that the player log in.
+     *
+     * @param player the player
+     */
+    private void requestLogin(Player player) {
         Utils.teleportToSpawn(player);
         LimboCache cache = LimboCache.getInstance();
         cache.updateLimboPlayer(player);
@@ -131,22 +136,12 @@ public class ProcessSyncPasswordRegister implements Process {
             return;
         }
 
-        // Register is finish and player is logged, display welcome message
-        if (service.getProperty(RegistrationSettings.USE_WELCOME_MESSAGE)) {
-            if (service.getProperty(RegistrationSettings.BROADCAST_WELCOME_MESSAGE)) {
-                for (String s : service.getSettings().getWelcomeMessage()) {
-                    plugin.getServer().broadcastMessage(plugin.replaceAllInfo(s, player));
-                }
-            } else {
-                for (String s : service.getSettings().getWelcomeMessage()) {
-                    player.sendMessage(plugin.replaceAllInfo(s, player));
-                }
-            }
-        }
+        // Register is now finished; we can force all commands
+        forceCommands();
 
-        // Request Login after Registration
+        // Request login after registration
         if (service.getProperty(RegistrationSettings.FORCE_LOGIN_AFTER_REGISTER)) {
-            forceLogin(player);
+            requestLogin(player);
             return;
         }
 
@@ -154,9 +149,6 @@ public class ProcessSyncPasswordRegister implements Process {
             sendBungeeMessage();
         }
 
-        // Register is now finished; we can force all commands
-        forceCommands();
-
         sendTo();
     }
 
diff --git a/src/main/java/fr/xephi/authme/settings/properties/RegistrationSettings.java b/src/main/java/fr/xephi/authme/settings/properties/RegistrationSettings.java
index c2c2bbe3a..db1cb1ee1 100644
--- a/src/main/java/fr/xephi/authme/settings/properties/RegistrationSettings.java
+++ b/src/main/java/fr/xephi/authme/settings/properties/RegistrationSettings.java
@@ -67,7 +67,7 @@ public class RegistrationSettings implements SettingsClass {
         newListProperty("settings.forceRegisterCommandsAsConsole");
 
     @Comment({
-        "Enable to display the welcome message (welcome.txt) after a registration or a login",
+        "Enable to display the welcome message (welcome.txt) after a login",
         "You can use colors in this welcome.txt + some replaced strings:",
         "{PLAYER}: player name, {ONLINE}: display number of online players, {MAXPLAYERS}: display server slots,",
         "{IP}: player ip, {LOGINS}: number of players logged, {WORLD}: player current world, {SERVER}: server name",
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 86aecfaa4..17b62b370 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -253,11 +253,11 @@ settings:
     forceRegisterCommands: []
     # Force these commands after /register as a server console, without any '/', use %p for replace with player name
     forceRegisterCommandsAsConsole: []
-    # Do we need to display the welcome message (welcome.txt) after a register or a login?
-    # You can use colors in this welcome.txt + some replaced strings :
-    # {PLAYER} : player name, {ONLINE} : display number of online players, {MAXPLAYERS} : display server slots,
-    # {IP} : player ip, {LOGINS} : number of players logged, {WORLD} : player current world, {SERVER} : server name
-    # {VERSION} : get current bukkit version, {COUNTRY} : player country
+    # Do we need to display the welcome message (welcome.txt) after a login?
+    # You can use colors in this welcome.txt + some replaced strings:
+    # {PLAYER}: player name, {ONLINE}: display number of online players, {MAXPLAYERS}: display server slots,
+    # {IP}: player ip, {LOGINS}: number of players logged, {WORLD}: player current world, {SERVER}: server name
+    # {VERSION}: get current bukkit version, {COUNTRY}: player country
     useWelcomeMessage: true
     # Do we need to broadcast the welcome message to all server or only to the player? set true for server or false for player
     broadcastWelcomeMessage: false