From 26e9cde01e5d051b82da961054e493d797b22598 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Fri, 4 Nov 2022 19:25:43 +0100 Subject: Fix vanilla clients being kicked from NCR servers Fixes #271 --- .../nochatreports/NoChatReportsClient.java | 1 + .../MixinServerboundChatSessionUpdatePacket.java | 24 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatSessionUpdatePacket.java (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index ff60850..868d225 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -33,6 +33,7 @@ import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.contents.TranslatableContents; import net.minecraft.network.protocol.game.ServerboundChatPacket; +import net.minecraft.network.protocol.game.ServerboundChatSessionUpdatePacket; import net.minecraft.realms.RealmsScreen; /** diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatSessionUpdatePacket.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatSessionUpdatePacket.java new file mode 100644 index 0000000..f90fe74 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatSessionUpdatePacket.java @@ -0,0 +1,24 @@ +package com.aizistral.nochatreports.mixins.server; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import net.minecraft.network.protocol.game.ServerGamePacketListener; +import net.minecraft.network.protocol.game.ServerboundChatSessionUpdatePacket; + +@Mixin(ServerboundChatSessionUpdatePacket.class) +public class MixinServerboundChatSessionUpdatePacket { + + /** + * @reason Ignore chat sessions from client, since we throw away signatures anyways. + * @author Aizistral + */ + + @Inject(method = "handle", at = @At("HEAD"), cancellable = true) + private void onHandle(ServerGamePacketListener listener, CallbackInfo info) { + info.cancel(); + } + +} -- cgit v1.2.3