Change how welcome message is send

This commit is contained in:
Xephi 2015-12-21 15:52:58 +01:00
parent 37eedfde62
commit 48b845b1f5
2 changed files with 8 additions and 8 deletions

View File

@ -200,8 +200,8 @@ public class ProcessSyncronousPlayerLogin implements Runnable {
player.saveData(); player.saveData();
if (Settings.bungee) if (Settings.bungee)
sendBungeeMessage(); sendBungeeMessage();
// Login is finish, display welcome message // Login is finish, display welcome message if we use email registration
if (Settings.useWelcomeMessage) if (Settings.useWelcomeMessage && Settings.emailRegistration)
if (Settings.broadcastWelcomeMessage) { if (Settings.broadcastWelcomeMessage) {
for (String s : Settings.welcomeMsg) { for (String s : Settings.welcomeMsg) {
Bukkit.getServer().broadcastMessage(plugin.replaceAllInfo(s, player)); Bukkit.getServer().broadcastMessage(plugin.replaceAllInfo(s, player));

View File

@ -142,12 +142,6 @@ public class ProcessSyncPasswordRegister implements Runnable {
return; return;
} }
// Request Login after Registration
if (Settings.forceRegLogin) {
forceLogin(player);
return;
}
// Register is finish and player is logged, display welcome message // Register is finish and player is logged, display welcome message
if (Settings.useWelcomeMessage) { if (Settings.useWelcomeMessage) {
if (Settings.broadcastWelcomeMessage) { 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) { if (Settings.bungee) {
sendBungeeMessage(); sendBungeeMessage();
} }