From 7d6c61258b57b4730dbfea07cff2a67962a282cc Mon Sep 17 00:00:00 2001
From: ljacqu <ljacqu@users.noreply.github.com>
Date: Sat, 4 Nov 2017 10:17:52 +0100
Subject: [PATCH] Fix #1401 bungeecord message sent even if disabled

---
 .../authme/service/bungeecord/BungeeService.java     | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/service/bungeecord/BungeeService.java b/src/main/java/fr/xephi/authme/service/bungeecord/BungeeService.java
index 139f03bf..3b45a897 100644
--- a/src/main/java/fr/xephi/authme/service/bungeecord/BungeeService.java
+++ b/src/main/java/fr/xephi/authme/service/bungeecord/BungeeService.java
@@ -71,12 +71,10 @@ public class BungeeService implements SettingsDependent, PluginMessageListener {
      * @param player The player to send.
      */
     public void connectPlayerOnLogin(Player player) {
-        if (!isEnabled || destinationServerOnLogin.isEmpty()) {
-            return;
+        if (isEnabled && !destinationServerOnLogin.isEmpty()) {
+            service.scheduleSyncDelayedTask(() ->
+                sendBungeecordMessage("Connect", player.getName(), destinationServerOnLogin), 20L);
         }
-
-        service.scheduleSyncDelayedTask(() ->
-            sendBungeecordMessage("Connect", player.getName(), destinationServerOnLogin), 20L);
     }
 
     /**
@@ -87,10 +85,8 @@ public class BungeeService implements SettingsDependent, PluginMessageListener {
      */
     public void sendAuthMeBungeecordMessage(String type, String playerName) {
         if (isEnabled) {
-            return;
+            sendBungeecordMessage("AuthMe", type, playerName.toLowerCase());
         }
-
-        sendBungeecordMessage("AuthMe", type, playerName.toLowerCase());
     }
 
     @Override