Fix transferred cookie connection. (Closes #1540)

Signed-off-by: 秋雨落 <[email protected]>
IzzelAliz · Nov 7, 2024 · c3818c5 · c3818c5
1 parent c326299
commit c3818c5
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/...java/io/izzel/arclight/common/mixin/core/network/ServerCommonPacketListenerImplMixin.java b/...java/io/izzel/arclight/common/mixin/core/network/ServerCommonPacketListenerImplMixin.java
@@ -52,7 +52,7 @@
 public abstract class ServerCommonPacketListenerImplMixin implements ServerCommonPacketListenerBridge, PacketListener, CraftPlayer.TransferCookieConnection {
 
     // @formatter:off
-    @Shadow @Final protected Connection connection;
+    @Shadow @Final public Connection connection;
     @Shadow @Final protected MinecraftServer server;
     @Shadow public abstract void send(Packet<?> p_300558_);
     @Shadow protected abstract boolean isSingleplayerOwner();

diff --git a/.../izzel/arclight/common/mixin/core/network/ServerConfigurationPacketListenerImplMixin.java b/.../izzel/arclight/common/mixin/core/network/ServerConfigurationPacketListenerImplMixin.java
@@ -12,6 +12,7 @@
 import net.minecraft.server.players.PlayerList;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v.CraftServerLinks;
+import org.bukkit.craftbukkit.v.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerLinksSendEvent;
 import org.spongepowered.asm.mixin.Mixin;
@@ -21,7 +22,7 @@
 import java.net.SocketAddress;
 
 @Mixin(ServerConfigurationPacketListenerImpl.class)
-public abstract class ServerConfigurationPacketListenerImplMixin extends ServerCommonPacketListenerImplMixin {
+public abstract class ServerConfigurationPacketListenerImplMixin extends ServerCommonPacketListenerImplMixin implements CraftPlayer.TransferCookieConnection {
 
     @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/...re/network/ServerPlayNetHandlerMixin.java → ...rk/ServerGamePacketListenerImplMixin.java b/...re/network/ServerPlayNetHandlerMixin.java → ...rk/ServerGamePacketListenerImplMixin.java
@@ -166,7 +166,7 @@
 import java.util.logging.Level;
 
 @Mixin(ServerGamePacketListenerImpl.class)
-public abstract class ServerPlayNetHandlerMixin extends ServerCommonPacketListenerImplMixin implements ServerPlayNetHandlerBridge {
+public abstract class ServerGamePacketListenerImplMixin extends ServerCommonPacketListenerImplMixin implements ServerPlayNetHandlerBridge, CraftPlayer.TransferCookieConnection {
 
     // @formatter:off
     @Shadow public ServerPlayer player;

diff --git a/...twork/ServerHandshakeNetHandlerMixin.java → ...rverHandshakePacketListenerImplMixin.java b/...twork/ServerHandshakeNetHandlerMixin.java → ...rverHandshakePacketListenerImplMixin.java
@@ -26,7 +26,7 @@
 import java.util.HashMap;
 
 @Mixin(ServerHandshakePacketListenerImpl.class)
-public abstract class ServerHandshakeNetHandlerMixin implements ServerHandshakeNetHandlerBridge {
+public abstract class ServerHandshakePacketListenerImplMixin implements ServerHandshakeNetHandlerBridge {
 
     private static final Gson gson = new Gson();
     private static final java.util.regex.Pattern HOST_PATTERN = java.util.regex.Pattern.compile("[0-9a-f\\.:]{0,45}");

diff --git a/...e/network/ServerLoginNetHandlerMixin.java → ...k/ServerLoginPacketListenerImplMixin.java b/...e/network/ServerLoginNetHandlerMixin.java → ...k/ServerLoginPacketListenerImplMixin.java
@@ -67,7 +67,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 @Mixin(ServerLoginPacketListenerImpl.class)
-public abstract class ServerLoginNetHandlerMixin implements ServerLoginNetHandlerBridge, CraftPlayer.TransferCookieConnection {
+public abstract class ServerLoginPacketListenerImplMixin implements ServerLoginNetHandlerBridge, CraftPlayer.TransferCookieConnection {
 
     // @formatter:off
     @Shadow private ServerLoginPacketListenerImpl.State state;

diff --git a/.../network/ServerStatusNetHandlerMixin.java → .../ServerStatusPacketListenerImplMixin.java b/.../network/ServerStatusNetHandlerMixin.java → .../ServerStatusPacketListenerImplMixin.java
@@ -25,7 +25,7 @@
 import java.util.Optional;
 
 @Mixin(ServerStatusPacketListenerImpl.class)
-public class ServerStatusNetHandlerMixin implements ServerStatusPacketListenerBridge {
+public class ServerStatusPacketListenerImplMixin implements ServerStatusPacketListenerBridge {
 
     @Redirect(method = "handleStatusRequest", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/Connection;send(Lnet/minecraft/network/protocol/Packet;)V"))
     private void arclight$handleServerPing(Connection networkManager, Packet<?> packetIn) {

diff --git a/arclight-common/src/main/resources/mixins.arclight.core.json b/arclight-common/src/main/resources/mixins.arclight.core.json
@@ -33,10 +33,10 @@
     "network.ServerCommonPacketListenerImplMixin",
     "network.ServerConfigurationPacketListenerImplMixin",
     "network.ServerGamePacketListenerImpl_HandlerMixin",
-    "network.ServerHandshakeNetHandlerMixin",
-    "network.ServerLoginNetHandlerMixin",
-    "network.ServerPlayNetHandlerMixin",
-    "network.ServerStatusNetHandlerMixin",
+    "network.ServerHandshakePacketListenerImplMixin",
+    "network.ServerLoginPacketListenerImplMixin",
+    "network.ServerGamePacketListenerImplMixin",
+    "network.ServerStatusPacketListenerImplMixin",
     "network.SynchedEntityDataMixin",
     "network.chat.ComponentMixin",
     "network.chat.StyleMixin",