From a4fc8e00eba9ff85e4372f0b2c33a822dc8cc337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E9=9B=A8=E8=90=BD?= Date: Fri, 8 Nov 2024 13:21:01 +0800 Subject: [PATCH] Fix #1540. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 秋雨落 --- .../core/network/ServerCommonPacketListenerImplMixin.java | 5 +++++ .../network/ServerConfigurationPacketListenerImplMixin.java | 2 +- .../core/network/ServerGamePacketListenerImplMixin.java | 2 +- .../core/network/ServerLoginPacketListenerImplMixin.java | 5 +++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerCommonPacketListenerImplMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerCommonPacketListenerImplMixin.java index 2c98161e..3827e72b 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerCommonPacketListenerImplMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerCommonPacketListenerImplMixin.java @@ -259,4 +259,9 @@ public ConnectionProtocol getProtocol() { public void sendPacket(Packet packet) { this.send(packet); } + + @Override + public void kickPlayer(Component component) { + disconnect(component); + } } diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerConfigurationPacketListenerImplMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerConfigurationPacketListenerImplMixin.java index c2c7372c..d8698452 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerConfigurationPacketListenerImplMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerConfigurationPacketListenerImplMixin.java @@ -22,7 +22,7 @@ import java.net.SocketAddress; @Mixin(ServerConfigurationPacketListenerImpl.class) -public abstract class ServerConfigurationPacketListenerImplMixin extends ServerCommonPacketListenerImplMixin implements CraftPlayer.TransferCookieConnection { +public abstract class ServerConfigurationPacketListenerImplMixin extends ServerCommonPacketListenerImplMixin { @Decorate(method = "startConfiguration", require = 0, at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;serverLinks()Lnet/minecraft/server/ServerLinks;")) private ServerLinks arclight$sendLinksEvent(MinecraftServer instance) throws Throwable { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerGamePacketListenerImplMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerGamePacketListenerImplMixin.java index c1e3e6db..80586430 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerGamePacketListenerImplMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerGamePacketListenerImplMixin.java @@ -167,7 +167,7 @@ import java.util.logging.Level; @Mixin(ServerGamePacketListenerImpl.class) -public abstract class ServerGamePacketListenerImplMixin extends ServerCommonPacketListenerImplMixin implements ServerPlayNetHandlerBridge, CraftPlayer.TransferCookieConnection { +public abstract class ServerGamePacketListenerImplMixin extends ServerCommonPacketListenerImplMixin implements ServerPlayNetHandlerBridge { // @formatter:off @Shadow public ServerPlayer player; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerLoginPacketListenerImplMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerLoginPacketListenerImplMixin.java index 3d0f7852..6e76d0cd 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerLoginPacketListenerImplMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerLoginPacketListenerImplMixin.java @@ -377,4 +377,9 @@ public ConnectionProtocol getProtocol() { public void sendPacket(Packet packet) { this.connection.send(packet); } + + @Override + public void kickPlayer(Component component) { + disconnect(component); + } }