From 48b845b1f51796459a494794f0e0e091ed65ff04 Mon Sep 17 00:00:00 2001 From: Xephi Date: Mon, 21 Dec 2015 15:52:58 +0100 Subject: [PATCH] Change how welcome message is send --- .../process/login/ProcessSyncronousPlayerLogin.java | 4 ++-- .../register/ProcessSyncPasswordRegister.java | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java b/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java index b22c8f60..73f53fb6 100644 --- a/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java +++ b/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java @@ -200,8 +200,8 @@ public class ProcessSyncronousPlayerLogin implements Runnable { player.saveData(); if (Settings.bungee) sendBungeeMessage(); - // Login is finish, display welcome message - if (Settings.useWelcomeMessage) + // Login is finish, display welcome message if we use email registration + if (Settings.useWelcomeMessage && Settings.emailRegistration) if (Settings.broadcastWelcomeMessage) { for (String s : Settings.welcomeMsg) { Bukkit.getServer().broadcastMessage(plugin.replaceAllInfo(s, player)); 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 17916167..708bd1ee 100644 --- a/src/main/java/fr/xephi/authme/process/register/ProcessSyncPasswordRegister.java +++ b/src/main/java/fr/xephi/authme/process/register/ProcessSyncPasswordRegister.java @@ -142,12 +142,6 @@ public class ProcessSyncPasswordRegister implements Runnable { return; } - // Request Login after Registration - if (Settings.forceRegLogin) { - forceLogin(player); - return; - } - // Register is finish and player is logged, display welcome message if (Settings.useWelcomeMessage) { if (Settings.broadcastWelcomeMessage) { @@ -161,6 +155,12 @@ public class ProcessSyncPasswordRegister implements Runnable { } } + // Request Login after Registration + if (Settings.forceRegLogin) { + forceLogin(player); + return; + } + if (Settings.bungee) { sendBungeeMessage(); }