summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorAizistral2022-11-04 19:25:43 +0100
committerAizistral2022-11-04 19:25:43 +0100
commit26e9cde01e5d051b82da961054e493d797b22598 (patch)
treea3bb9a38c7debc4e9487a8e320205194633abc9c /src/main
parentd77699a2a04d10fb4cf5c4d73ff4d6381670ac1d (diff)
Fix vanilla clients being kicked from NCR servers
Fixes #271
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java1
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatSessionUpdatePacket.java24
-rw-r--r--src/main/resources/nochatreports.mixins.json3
3 files changed, 27 insertions, 1 deletions
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();
+ }
+
+}
diff --git a/src/main/resources/nochatreports.mixins.json b/src/main/resources/nochatreports.mixins.json
index f91d75a..d9b82f3 100644
--- a/src/main/resources/nochatreports.mixins.json
+++ b/src/main/resources/nochatreports.mixins.json
@@ -9,7 +9,8 @@
"common.MixinServerStatusSerializer",
"server.MixinServerboundChatPacket",
"server.MixinServerGamePacketListenerImpl",
- "server.MixinPlayerList"
+ "server.MixinPlayerList",
+ "server.MixinServerboundChatSessionUpdatePacket"
],
"client": [
"client.MixinOptions",