Don't forward chat acknowledgement if the client didn't acknowledge a…

…ny chat
PaperMC · Jul 5, 2024 · 4eae510 · 4eae510
1 parent c6bb15c
commit 4eae510
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/chat/LastSeenMessages.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/chat/LastSeenMessages.java
@@ -52,10 +52,6 @@ public void encode(ByteBuf buf) {
     buf.writeBytes(Arrays.copyOf(acknowledged.toByteArray(), DIV_FLOOR));
   }
 
-  public boolean isEmpty() {
-    return acknowledged.isEmpty();
-  }
-
   public int getOffset() {
     return this.offset;
   }

diff --git a/...in/java/com/velocitypowered/proxy/protocol/packet/chat/session/SessionCommandHandler.java b/...in/java/com/velocitypowered/proxy/protocol/packet/chat/session/SessionCommandHandler.java
@@ -60,7 +60,11 @@ private MinecraftPacket consumeCommand(SessionPlayerCommandPacket packet) {
     }
     // An unsigned command with a 'last seen' update will not happen as of 1.20.5+, but for earlier versions - we still
     // need to pass through the acknowledgement
-    return new ChatAcknowledgementPacket(packet.lastSeenMessages.getOffset());
+    final int offset = packet.lastSeenMessages.getOffset();
+    if (offset != 0) {
+      return new ChatAcknowledgementPacket(offset);
+    }
+    return null;
   }
 
   @Nullable