From b4c6f4ec6442693e1ae6c5ffd39db464c591a084 Mon Sep 17 00:00:00 2001 From: deirn Date: Wed, 4 Oct 2023 10:51:42 +0700 Subject: [PATCH] only send c2s sync packet if s2c sync packet is received closes https://github.com/badasintended/wthit/issues/230 again --- .../lol/bai/badpackets/impl/handler/ClientPacketHandler.java | 1 + .../badpackets/impl/mixin/client/MixinClientPacketListener.java | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/lol/bai/badpackets/impl/handler/ClientPacketHandler.java b/src/main/java/lol/bai/badpackets/impl/handler/ClientPacketHandler.java index 3833f1c..4e6609b 100644 --- a/src/main/java/lol/bai/badpackets/impl/handler/ClientPacketHandler.java +++ b/src/main/java/lol/bai/badpackets/impl/handler/ClientPacketHandler.java @@ -32,6 +32,7 @@ public static ClientPacketHandler get() { @Override protected void onInitialChannelSyncPacketReceived() { + sendInitialChannelSyncPacket(); for (PacketSenderReadyCallback.Client callback : CallbackRegistry.CLIENT_PLAYER_JOIN) { callback.onJoin(listener, this, Minecraft.getInstance()); } diff --git a/src/main/java/lol/bai/badpackets/impl/mixin/client/MixinClientPacketListener.java b/src/main/java/lol/bai/badpackets/impl/mixin/client/MixinClientPacketListener.java index a1000b8..378429d 100644 --- a/src/main/java/lol/bai/badpackets/impl/mixin/client/MixinClientPacketListener.java +++ b/src/main/java/lol/bai/badpackets/impl/mixin/client/MixinClientPacketListener.java @@ -40,8 +40,6 @@ private void badpackets_removeClientPacketHandler(Component reason, CallbackInfo @Inject(method = "handleCustomPayload", at = @At("HEAD"), cancellable = true) private void badpackets_receiveS2CPacket(ClientboundCustomPayloadPacket packet, CallbackInfo ci) { - badpacket_packetHandler.sendInitialChannelSyncPacket(); - if (!minecraft.isSameThread()) { FriendlyByteBuf buf = packet.getData(); try {