From 7240041291e3d5a48d9c5d42251f9309b9312c5c Mon Sep 17 00:00:00 2001
From: Shuiling <1668589925@qq.com>
Date: Wed, 18 Sep 2024 06:15:24 -0700
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=BA=86Listeners.ja?=
 =?UTF-8?q?va=E4=B8=AD=E7=9A=84=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cc/baka9/catseedlogin/bungee/Listeners.java    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/cc/baka9/catseedlogin/bungee/Listeners.java b/src/main/java/cc/baka9/catseedlogin/bungee/Listeners.java
index bcfa919..4051179 100644
--- a/src/main/java/cc/baka9/catseedlogin/bungee/Listeners.java
+++ b/src/main/java/cc/baka9/catseedlogin/bungee/Listeners.java
@@ -28,7 +28,8 @@ public class Listeners implements Listener {
      */
     @EventHandler
     public void onChat(ChatEvent event) {
-        if (!event.isProxyCommand() || !(event.getSender() instanceof ProxiedPlayer)) return;
+        if (!(event.isProxyCommand() && event.getSender() instanceof ProxiedPlayer)) return;
+
         ProxiedPlayer player = (ProxiedPlayer) event.getSender();
         String playerName = player.getName();
 
@@ -47,6 +48,7 @@ public void onChat(ChatEvent event) {
     public void onServerConnect(ServerConnectEvent event) {
         ServerInfo target = event.getTarget();
         if (event.isCancelled() || target.getName().equals(Config.LoginServerName)) return;
+
         ProxiedPlayer player = event.getPlayer();
         String playerName = player.getName();
 
@@ -103,11 +105,11 @@ public void onPreLogin(PreLoginEvent event) {
     private void handleLogin(ProxiedPlayer player, String message) {
         String playerName = player.getName();
         PluginMain.runAsync(() -> {
-            if (Communication.sendConnectRequest(playerName) == 1) {
-                loggedInPlayerList.add(playerName);
-                if (message != null) {
-                    proxyServer.getPluginManager().dispatchCommand(player, message.substring(1));
-                }
+                if (Communication.sendConnectRequest(playerName) == 1) {
+                    loggedInPlayerList.add(playerName);
+                    if (message != null) {
+                        proxyServer.getPluginManager().dispatchCommand(player, message.substring(1));
+                    }
             }
         });
     }