From 8b19ceec30a6919b942080991d0e7090af521354 Mon Sep 17 00:00:00 2001 From: zkhssb Date: Wed, 7 Jan 2026 20:09:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=A8=E6=97=A7?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=97=A0=E6=B3=95=E5=A4=84=E7=90=86=E7=8E=A9?= =?UTF-8?q?=E5=AE=B6=E5=8A=A0=E5=85=A5=E7=9A=84=E9=97=AE=E9=A2=98=20[2.1.3?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- src/main/java/com/springwater/easybot/event/PlayerEvents.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 8f4e1ca..c534c40 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } group = 'com.springwater.easybot' -version = '2.1.2' +version = '2.1.3' repositories { mavenCentral() diff --git a/src/main/java/com/springwater/easybot/event/PlayerEvents.java b/src/main/java/com/springwater/easybot/event/PlayerEvents.java index 4911d94..105107a 100644 --- a/src/main/java/com/springwater/easybot/event/PlayerEvents.java +++ b/src/main/java/com/springwater/easybot/event/PlayerEvents.java @@ -15,7 +15,7 @@ public void onPlayerLogin(AsyncPlayerPreLoginEvent event) { if(FakePlayerUtils.isFake(event.getName())) return; String ip = event.getAddress().getHostAddress(); String name = GeyserUtils.getName(event.getUniqueId()); - if (name == null) name = event.getPlayerProfile().getName(); + if (name == null) name = event.getName(); Easybot.getClient().reportPlayer(name, GeyserUtils.getUuid(event.getUniqueId()).toString(), ip); PlayerLoginResultPacket result = Easybot.getClient().login( name, From e0d394d107dc7f582d3729f2d9b29e88f203a7fb Mon Sep 17 00:00:00 2001 From: zkhssb Date: Wed, 7 Jan 2026 20:13:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=A8ItemsAdde?= =?UTF-8?q?r4.x=E4=B8=8A=E7=9A=84=E6=8A=A5=E9=94=99=20[2.1.3]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springwater/easybot/utils/ItemsAdderUtils.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/springwater/easybot/utils/ItemsAdderUtils.java b/src/main/java/com/springwater/easybot/utils/ItemsAdderUtils.java index e2d2fc8..a9a826b 100644 --- a/src/main/java/com/springwater/easybot/utils/ItemsAdderUtils.java +++ b/src/main/java/com/springwater/easybot/utils/ItemsAdderUtils.java @@ -14,18 +14,22 @@ public static boolean isItemsAdderInstalled() { } public static boolean isQFacesInstalled() { - if(!isItemsAdderInstalled()){ + try { + if (!isItemsAdderInstalled()) { + return false; + } + return new FontImageWrapper("qqnt_sysface_res:qface_0").exists(); + } catch (Exception ignored) { return false; } - return new FontImageWrapper("qqnt_sysface_res:qface_0").exists(); } public static String getFace(int faceId) { - if(!isQFacesInstalled()){ + if (!isQFacesInstalled()) { return ""; } FontImageWrapper warper = new FontImageWrapper("qqnt_sysface_res:qface_" + faceId); - if(!warper.exists()){ + if (!warper.exists()) { return null; } return warper.getString(); From 6c3cfa19a8aed19ed33a490a7ce73fea3f93e6d3 Mon Sep 17 00:00:00 2001 From: zkhssb Date: Wed, 7 Jan 2026 20:17:21 +0800 Subject: [PATCH 3/4] =?UTF-8?q?chore:=20=E5=8D=87=E7=BA=A7bridge=E8=87=B31?= =?UTF-8?q?.7-rc.1=E4=BB=A5=E4=BC=98=E5=8C=96=E7=BA=BF=E7=A8=8B=E6=B1=A0?= =?UTF-8?q?=E6=80=A7=E8=83=BD=20[2.1.3]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c534c40..83888c8 100644 --- a/build.gradle +++ b/build.gradle @@ -60,7 +60,7 @@ tasks.build.dependsOn(tasks.shadowJar) dependencies { compileOnly "org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT" - implementation 'com.springwater.easybot:easybot-bridge:1.5' + implementation 'com.springwater.easybot:easybot-bridge:1.7-rc.1' implementation 'org.javassist:javassist:3.28.0-GA' implementation 'bot.inker.acj:runtime:1.5' implementation 'org.reflections:reflections:0.10.2' From c4ca0e606c87a4f15712af53f3191f76527dc5a9 Mon Sep 17 00:00:00 2001 From: zkhssb Date: Wed, 7 Jan 2026 21:04:41 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DRCON=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E4=B8=8B=E9=A6=96=E6=AC=A1=E5=90=AF=E5=8A=A8=E7=A9=BA?= =?UTF-8?q?=E6=8C=87=E9=92=88=E9=97=AE=E9=A2=98=20[2.1.3]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/springwater/easybot/Easybot.java | 17 ----------------- .../com/springwater/easybot/api/CommandApi.java | 10 ++++++++-- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/springwater/easybot/Easybot.java b/src/main/java/com/springwater/easybot/Easybot.java index c92985a..b6f6e63 100644 --- a/src/main/java/com/springwater/easybot/Easybot.java +++ b/src/main/java/com/springwater/easybot/Easybot.java @@ -292,23 +292,6 @@ public void runTask(Runnable task) { } } - @EventHandler - public void onServerStarted(ServerLoadEvent event) { - if (event.getType() == ServerLoadEvent.LoadType.STARTUP) { - boolean useNativeRcon = getConfig().getBoolean("adapter.native_rcon.use_native_rcon", false); - if (!useNativeRcon) return; - Thread rconThread = new Thread(() -> { - try { - getLogger().info("10s后启动原生RCON,请耐心等待!"); - Thread.sleep(10000); - } catch (InterruptedException ignored) { - } - restartNativeRcon(); - }, "EasyBot-Rcon-Thread"); - rconThread.start(); - } - } - private void restartNativeRcon() { try { boolean useNativeRcon = getConfig().getBoolean("adapter.native_rcon.use_native_rcon", false); diff --git a/src/main/java/com/springwater/easybot/api/CommandApi.java b/src/main/java/com/springwater/easybot/api/CommandApi.java index d3cc310..cfcc805 100644 --- a/src/main/java/com/springwater/easybot/api/CommandApi.java +++ b/src/main/java/com/springwater/easybot/api/CommandApi.java @@ -29,6 +29,7 @@ public CommandApi() throws IllegalAccessException { if (useNativeRcon) { nativeRcon = new NativeRcon(); Easybot.instance.getLogger().info("命令接口初始化成功 [原生RCON接口]"); + startNativeRcon(); return; } @@ -63,8 +64,13 @@ private static Class getRconConsoleSourceClassPath() throws ClassNotFoundExce throw new ClassNotFoundException("Can not find RconConsoleSource class path"); } - public void startNativeRcon() throws AuthenticationException, IOException { - nativeRcon.start(); + public void startNativeRcon() { + new Thread(() -> { + try { + nativeRcon.start(); + } catch (Exception ignored) { + } + }).start(); } public void closeNativeRcon() {