#10 Remove ServerConnectEvent listener

we should only check the ServerSwitchEvent
AuthMe · Dec 3, 2017 · 0b93237 · 0b93237
1 parent 5823981
commit 0b93237
Showing 1 changed file with 4 additions and 25 deletions.
diff --git a/src/main/java/fr/xephi/authmebungee/listeners/BungeePlayerListener.java b/src/main/java/fr/xephi/authmebungee/listeners/BungeePlayerListener.java
@@ -5,10 +5,11 @@
 import fr.xephi.authmebungee.config.SettingsDependent;
 import fr.xephi.authmebungee.data.AuthPlayer;
 import fr.xephi.authmebungee.services.AuthPlayerManager;
-import net.md_5.bungee.api.ChatColor;
-import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
-import net.md_5.bungee.api.event.*;
+import net.md_5.bungee.api.event.ChatEvent;
+import net.md_5.bungee.api.event.PlayerDisconnectEvent;
+import net.md_5.bungee.api.event.PostLoginEvent;
+import net.md_5.bungee.api.event.ServerSwitchEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
 import net.md_5.bungee.event.EventPriority;
@@ -95,28 +96,6 @@ public void onChat(ChatEvent event) {
         event.setCancelled(true);
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST)
-    public void onServerConnect(ServerConnectEvent event) {
-        if (!isServerSwitchRequiresAuth || event.isCancelled()) {
-            return;
-        }
-
-        ProxiedPlayer player = event.getPlayer();
-        AuthPlayer authPlayer = authPlayerManager.getAuthPlayer(player);
-        if (authPlayer.isLogged()) {
-            return;
-        }
-
-        // If player is not logged in and serverSwitchRequiresAuth is enabled, cancel the connection
-        String server = event.getTarget().getName();
-        if (!authServers.contains(server)) {
-            event.setCancelled(true);
-            TextComponent reasonMessage = new TextComponent(requiresAuthKickMessage);
-            reasonMessage.setColor(ChatColor.RED);
-            player.sendMessage(reasonMessage);
-        }
-    }
-
     @EventHandler
     public void onServerSwitch(ServerSwitchEvent event) {
         if (!isAutoLogin) {