修复重复连接问题

mcdoeswhat · Apr 25, 2022 · 83c8a8e · 83c8a8e
1 parent 3e9104c
commit 83c8a8e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>me.albert</groupId>
     <artifactId>AmazingBot</artifactId>
     <packaging>jar</packaging>
-    <version>4.0.9</version>
+    <version>4.0.10</version>
     <name>AmazingBot</name>
 
     <properties>

diff --git a/resources/plugin.yml b/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: AmazingBot
-version: 4.0.9
+version: 4.0.10
 author: Albert
 main: me.albert.amazingbot.AmazingBot
 api-version: 1.13

diff --git a/src/me/albert/amazingbot/bot/Bot.java b/src/me/albert/amazingbot/bot/Bot.java
@@ -45,6 +45,9 @@ public static void setApi(BotAPI api) {
         Bot.api = api;
     }
 
+    public static BotClient getClient() {
+        return client;
+    }
 
     public static Boolean getConnected() {
         return !client.isClosed();

diff --git a/src/me/albert/amazingbot/bot/BotClient.java b/src/me/albert/amazingbot/bot/BotClient.java
@@ -98,7 +98,7 @@ public JsonObject processMessageSend(JsonObject object, int timeout) {
 
     @Override
     public void onMessage(String msg) {
-        if (!instance.isEnabled()) {
+        if (!instance.isEnabled() || Bot.getClient() != this) {
             this.close();
             return;
         }
@@ -143,6 +143,9 @@ public void processMessageRec(String msg) {
 
     @Override
     public void onOpen(ServerHandshake handshakedata) {
+        if (Bot.getClient() != this) {
+            this.close();
+        }
         AmazingBot.getInstance().getLogger().info("§a机器人连接成功!");
         callEvent(new WebSocketConnectedEvent());
     }
@@ -152,15 +155,14 @@ public void onOpen(ServerHandshake handshakedata) {
     public void onClose(int code, String reason, boolean remote) {
         AmazingBot.getInstance().getLogger().warning("机器人连接关闭: " + (remote ? "remote peer" : "us") + " Code: " + code + " Reason: " + reason);
         int delay = instance.getConfig().getInt("main.auto_reconnect");
-        synchronized (AmazingBot.getInstance()) {
-            if (instance.isEnabled() && code != 1000) {
-                if (this.isOpen()) {
+        if (instance.isEnabled() && code != 1000) {
+            AmazingBot.getInstance().getLogger().info("§a将在" + delay + "秒后再次尝试连接");
+            taskID = Bukkit.getScheduler().runTaskLater(instance, () -> {
+                if (Bot.getClient() != this) {
                     return;
                 }
-                AmazingBot.getInstance().getLogger().info("§a将在" + delay + "秒后再次尝试连接");
-                Bukkit.getScheduler().cancelTask(taskID);
-                taskID = Bukkit.getScheduler().runTaskLater(instance, this::reconnect, 20L * delay).getTaskId();
-            }
+                reconnect();
+            }, 20L * delay).getTaskId();
         }
     }
 

diff --git a/src/me/albert/amazingbot/utils/MsgUtil.java b/src/me/albert/amazingbot/utils/MsgUtil.java
@@ -64,7 +64,6 @@ public static String deFormatCQCode(String str) {
     }
 
 
-
     /**
      * @param file 绝对路径，例如 file:///C:\\Users\Richard\Pictures\1.png
      *             网络 URL，例如 http://i1.piimg.com/567571/fdd6e7b6d93f1ef0.jpg