From 1bbe1f4bbed57d5f9d0e055ec0d7b4c80e13ad3d Mon Sep 17 00:00:00 2001
From: MiniDay <372403923@qq.com>
Date: Mon, 14 Nov 2022 18:06:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=86=20ServerOnlineEvent=20?=
 =?UTF-8?q?=E5=BB=B6=E5=90=8E=E8=87=B3=20onEnable=20=E5=8F=91=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hamster3/mc/plugin/ball/bukkit/HamsterBallPlugin.java  | 7 +++++++
 .../hamster3/mc/plugin/core/bungee/HamsterBallPlugin.java  | 6 ++++++
 .../cn/hamster3/mc/plugin/ball/common/api/BallAPI.java     | 2 --
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/HamsterBallPlugin.java b/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/HamsterBallPlugin.java
index 15aacbc..c54ef3d 100644
--- a/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/HamsterBallPlugin.java
+++ b/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/HamsterBallPlugin.java
@@ -3,6 +3,8 @@ package cn.hamster3.mc.plugin.ball.bukkit;
 import cn.hamster3.mc.plugin.ball.bukkit.api.BallBukkitAPI;
 import cn.hamster3.mc.plugin.ball.bukkit.hook.PlaceholderHook;
 import cn.hamster3.mc.plugin.ball.bukkit.listener.BallBukkitListener;
+import cn.hamster3.mc.plugin.ball.common.api.BallAPI;
+import cn.hamster3.mc.plugin.ball.common.event.server.ServerOnlineEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -39,6 +41,11 @@ public class HamsterBallPlugin extends JavaPlugin {
         Logger logger = getLogger();
         Bukkit.getPluginManager().registerEvents(BallBukkitListener.INSTANCE, this);
         logger.info("已注册 BallBukkitListener.");
+        BallAPI.getInstance().sendBallMessage(
+                BallAPI.BALL_CHANNEL,
+                ServerOnlineEvent.ACTION,
+                new ServerOnlineEvent(BallAPI.getInstance().getLocalServerInfo())
+        );
         logger.info("HamsterBall 已启动.");
         sync(() -> {
             if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) {
diff --git a/hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/HamsterBallPlugin.java b/hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/HamsterBallPlugin.java
index 62c7697..7e0cb4b 100644
--- a/hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/HamsterBallPlugin.java
+++ b/hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/HamsterBallPlugin.java
@@ -3,6 +3,7 @@ package cn.hamster3.mc.plugin.core.bungee;
 import cn.hamster3.mc.plugin.ball.common.api.BallAPI;
 import cn.hamster3.mc.plugin.ball.common.entity.BallServerInfo;
 import cn.hamster3.mc.plugin.ball.common.entity.BallServerType;
+import cn.hamster3.mc.plugin.ball.common.event.server.ServerOnlineEvent;
 import cn.hamster3.mc.plugin.core.bungee.api.BallBungeeCordAPI;
 import cn.hamster3.mc.plugin.core.bungee.listener.BallBungeeCordListener;
 import cn.hamster3.mc.plugin.core.bungee.util.BallBungeeCordUtils;
@@ -45,6 +46,11 @@ public class HamsterBallPlugin extends Plugin {
             ProxyServer.getInstance().getServers().put(serverInfo.getId(), BallBungeeCordUtils.getServerInfo(serverInfo));
             HamsterBallPlugin.getInstance().getLogger().info("已添加子服 " + serverInfo.getId() + " 的接入点配置.");
         }
+        BallAPI.getInstance().sendBallMessage(
+                BallAPI.BALL_CHANNEL,
+                ServerOnlineEvent.ACTION,
+                new ServerOnlineEvent(BallAPI.getInstance().getLocalServerInfo())
+        );
         logger.info("HamsterBall 已启动.");
     }
 
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java
index 713a155..03379e4 100644
--- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java
+++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java
@@ -220,8 +220,6 @@ public abstract class BallAPI {
             }
 
         }
-
-        sendBallMessage(new BallMessageInfo(BALL_CHANNEL, ServerOnlineEvent.ACTION, new ServerOnlineEvent(localInfo)), true);
     }
 
     protected void connect() throws InterruptedException {