Workaround #47

Author: emyfops

common/src/main/java/com/lambda/mixin/ClientConnectionMixin.java

@@ -27,13 +27,17 @@ public class ClientConnectionMixin {
 
     @Inject(method = "send(Lnet/minecraft/network/packet/Packet;)V", at = @At("HEAD"), cancellable = true)
     private void sendingPacket(Packet<?> packet, final CallbackInfo callbackInfo) {
+        if (side != NetworkSide.SERVERBOUND) return;
+
         if (EventFlow.post(new PacketEvent.Send.Pre((Packet<ServerPacketListener>) packet)).isCanceled()) {
             callbackInfo.cancel();
         }
     }
 
     @Inject(method = "send(Lnet/minecraft/network/packet/Packet;)V", at = @At("RETURN"))
     private void sendingPacketPost(Packet<?> packet, final CallbackInfo callbackInfo) {
+        if (side != NetworkSide.SERVERBOUND) return;
+
         EventFlow.post(new PacketEvent.Send.Post((Packet<ServerPacketListener>) packet));
     }
 
@@ -44,6 +48,7 @@ private void receivingPacket(
             CallbackInfo callbackInfo
     ) {
         if (side != NetworkSide.CLIENTBOUND) return;
+
         if (EventFlow.post(new PacketEvent.Receive.Pre((Packet<ClientPacketListener>) packet)).isCanceled()) {
             callbackInfo.cancel();
         }

common/src/main/kotlin/com/lambda/module/modules/movement/Blink.kt

@@ -10,11 +10,10 @@ import com.lambda.module.Module
 import com.lambda.module.modules.client.GuiSettings
 import com.lambda.module.modules.combat.KillAura
 import com.lambda.module.tag.ModuleTag
+import com.lambda.util.ClientPacket
 import com.lambda.util.PacketUtils.handlePacketSilently
 import com.lambda.util.PacketUtils.sendPacketSilently
 import com.lambda.util.math.ColorUtils.setAlpha
-import net.minecraft.network.listener.ServerPacketListener
-import net.minecraft.network.packet.Packet
 import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket
 import net.minecraft.network.packet.s2c.play.EntityVelocityUpdateS2CPacket
 import net.minecraft.util.math.BlockPos
@@ -32,7 +31,7 @@ object Blink : Module(
 
     private val isActive get() = (KillAura.isEnabled && KillAura.target != null) || !requiresAura
 
-    private var packetPool = ConcurrentLinkedDeque<Packet<out ServerPacketListener>>()
+    private var packetPool = ConcurrentLinkedDeque<ClientPacket>()
     private var lastVelocity: EntityVelocityUpdateS2CPacket? = null
     private var lastUpdate = 0L
 
@@ -56,7 +55,6 @@ object Blink : Module(
 
         listener<PacketEvent.Send.Pre> { event ->
             if (!isActive) return@listener
-            if (!connection.connection.isOpen) return@listener
 
             packetPool.add(event.packet)
             event.cancel()

common/src/main/kotlin/com/lambda/util/PacketUtils.kt

@@ -16,6 +16,9 @@ object PacketUtils {
      */
     fun ClientPlayNetworkHandler.sendPacketSilently(packet: ClientPacket) {
         if (!connection.isOpen) return
+        if (connection.packetListener?.accepts(packet) == true)
+            return // LOG.debug("Client tried to send client-bound packet {} to server ", packet)
+
         connection.send(packet, null, true)
         connection.packetsSentCounter++
     }
@@ -29,7 +32,8 @@ object PacketUtils {
      */
     fun ClientPlayNetworkHandler.handlePacketSilently(packet: ServerPacket) {
         if (!connection.isOpen) return
-        if (connection.packetListener?.accepts(packet) == false) return
+        if (connection.packetListener?.accepts(packet) == false)
+            return // LOG.debug("Client tried to handle server-bound packet {}", packet)
 
         ClientConnection.handlePacket(packet, connection.packetListener)
         connection.packetsReceivedCounter++