From 7153d2f1a76b65cdee665667131125a4f9804d64 Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Sun, 30 Oct 2022 02:50:59 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/ball/bukkit/listener/BallBukkitListener.java | 2 +- .../core/bungee/listener/BallBungeeCordListener.java | 2 +- .../cn/hamster3/mc/plugin/ball/common/api/BallAPI.java | 7 +------ .../plugin/ball/common/connector/BallChannelHandler.java | 9 +-------- .../plugin/ball/common/listener/BallDebugListener.java | 9 ++------- .../mc/plugin/ball/common/listener/BallListener.java | 5 +---- .../ball/server/connector/BallServerChannelHandler.java | 2 +- 7 files changed, 8 insertions(+), 28 deletions(-) diff --git a/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/listener/BallBukkitListener.java b/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/listener/BallBukkitListener.java index 416d470..a2163d8 100644 --- a/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/listener/BallBukkitListener.java +++ b/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/listener/BallBukkitListener.java @@ -34,7 +34,7 @@ public class BallBukkitListener extends BallListener implements Listener { } @Override - public void onReconnectFailed() { + public void onServiceDead() { Bukkit.shutdown(); } diff --git a/hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/listener/BallBungeeCordListener.java b/hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/listener/BallBungeeCordListener.java index c5fe400..d00e1cc 100644 --- a/hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/listener/BallBungeeCordListener.java +++ b/hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/listener/BallBungeeCordListener.java @@ -96,7 +96,7 @@ public final class BallBungeeCordListener extends BallListener implements Listen } @Override - public void onReconnectFailed() { + public void onServiceDead() { ProxyServer.getInstance().stop("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 4e5703c..cd12e96 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 @@ -129,11 +129,6 @@ public abstract class BallAPI { BallServerInfo info = event.getServerInfo(); serverInfo.put(info.getId(), info); } - - @Override - public void onConnectInactive() { - reconnect(5); - } }); } @@ -258,7 +253,7 @@ public abstract class BallAPI { if (ttl <= 0) { for (BallListener listener : getListeners()) { try { - listener.onReconnectFailed(); + listener.onServiceDead(); } catch (Exception e) { e.printStackTrace(); } diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelHandler.java b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelHandler.java index 9092679..1d55b5a 100644 --- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelHandler.java +++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelHandler.java @@ -154,20 +154,13 @@ public class BallChannelHandler extends SimpleChannelInboundHandler { @Override public void channelActive(@NotNull ChannelHandlerContext context) { - BallAPI.getInstance().getLogger().warning("与服务器 " + context.channel().remoteAddress() + " 的连接已可用."); + BallAPI.getInstance().getLogger().info("与服务器 " + context.channel().remoteAddress() + " 建立了连接."); } @Override public void channelInactive(@NotNull ChannelHandlerContext context) { context.close(); BallAPI.getInstance().getLogger().warning("与服务器 " + context.channel().remoteAddress() + " 的连接已断开."); - for (BallListener listener : BallAPI.getInstance().getListeners()) { - try { - listener.onConnectInactive(); - } catch (Exception | Error e) { - e.printStackTrace(); - } - } BallAPI.getInstance().reconnect(5); } diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallDebugListener.java b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallDebugListener.java index 527dba9..2ab6ee3 100644 --- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallDebugListener.java +++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallDebugListener.java @@ -26,19 +26,14 @@ public final class BallDebugListener extends BallListener { BallAPI.getInstance().getLogger().info("连接已可用。"); } - @Override - public void onConnectInactive() { - BallAPI.getInstance().getLogger().info("连接已中断！"); - } - @Override public void onConnectException(Throwable throwable) { BallAPI.getInstance().getLogger().log(Level.INFO, "连接出现错误！", throwable); } @Override - public void onReconnectFailed() { - BallAPI.getInstance().getLogger().info("重新连接失败！"); + public void onServiceDead() { + BallAPI.getInstance().getLogger().info("已无法建立与服务中心的连接！"); } @Override diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallListener.java b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallListener.java index 4c11797..e3486cc 100644 --- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallListener.java +++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallListener.java @@ -26,13 +26,10 @@ public abstract class BallListener { public void onMessageSend(@NotNull BallMessageInfo event) { } - public void onConnectInactive() { - } - public void onConnectException(Throwable throwable) { } - public void onReconnectFailed() { + public void onServiceDead() { } public void onBallPlayerPreLogin(@NotNull BallPlayerPreLoginEvent event) { diff --git a/hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerChannelHandler.java b/hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerChannelHandler.java index bcae267..4b006e9 100644 --- a/hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerChannelHandler.java +++ b/hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerChannelHandler.java @@ -36,7 +36,7 @@ public class BallServerChannelHandler extends SimpleChannelInboundHandler