Trigger full disconnect client disconnects

ramidzkh · Aug 18, 2023 · 6e1b181 · 6e1b181
1 parent dd0b8e7
commit 6e1b181
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/src/main/java/me/ramidzkh/qc/mixin/ConnectionMixin.java b/src/main/java/me/ramidzkh/qc/mixin/ConnectionMixin.java
@@ -1,6 +1,8 @@
 package me.ramidzkh.qc.mixin;
 
+import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
+import io.netty.incubator.codec.quic.QuicStreamChannel;
 import me.ramidzkh.qc.client.QuicConnection;
 import me.ramidzkh.qc.client.QuicSocketAddress;
 import me.ramidzkh.qc.client.QuicTier;
@@ -9,6 +11,7 @@
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
@@ -18,6 +21,9 @@
 @Mixin(Connection.class)
 public class ConnectionMixin {
 
+    @Shadow
+    private Channel channel;
+
     @Shadow
     private boolean encrypted;
 
@@ -33,6 +39,15 @@ private static void onConnect(InetSocketAddress address, boolean useNativeTransp
         }
     }
 
+    @Redirect(method = "disconnect", at = @At(value = "FIELD", target = "Lnet/minecraft/network/Connection;channel:Lio/netty/channel/Channel;"))
+    private Channel getChannelForDisconnect(Connection self) {
+        if (channel instanceof QuicStreamChannel quic) {
+            return quic.parent();
+        } else {
+            return channel;
+        }
+    }
+
     @Inject(method = "setEncryptionKey", at = @At("HEAD"), cancellable = true)
     private void onSetEncryptionKey(CallbackInfo callbackInfo) {
         if (encrypted) {