From 935077222e98a812955d92d00216787bccf8c416 Mon Sep 17 00:00:00 2001
From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com>
Date: Sun, 7 Apr 2024 20:08:16 +0200
Subject: [PATCH] Simplify code

---
 .../Protocol1_20_5To1_20_3.java                | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/Protocol1_20_5To1_20_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/Protocol1_20_5To1_20_3.java
index 2d2b17ab0..fbaed65bc 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/Protocol1_20_5To1_20_3.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/Protocol1_20_5To1_20_3.java
@@ -26,7 +26,6 @@ import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.packet.State;
 import com.viaversion.viaversion.api.protocol.packet.provider.PacketTypesProvider;
 import com.viaversion.viaversion.api.protocol.packet.provider.SimplePacketTypesProvider;
-import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.misc.ParticleType;
 import com.viaversion.viaversion.api.type.types.version.Types1_20_5;
@@ -120,9 +119,10 @@ public final class Protocol1_20_5To1_20_3 extends AbstractProtocol<ClientboundPa
                 wrapper.passthrough(Type.SIGNATURE_BYTES); // Signature
             }
 
+            // Remove original acknowledgement
             wrapper.read(Type.VAR_INT); // Offset
             wrapper.read(Type.ACKNOWLEDGED_BIT_SET); // Acknowledged
-            getChatAckHandler().handle(wrapper);
+            writeChatAck(wrapper);
         });
         registerServerbound(ServerboundPackets1_20_5.CHAT_COMMAND, wrapper -> {
             wrapper.passthrough(Type.STRING); // Command
@@ -130,7 +130,7 @@ public final class Protocol1_20_5To1_20_3 extends AbstractProtocol<ClientboundPa
             wrapper.write(Type.LONG, System.currentTimeMillis()); // Timestamp
             wrapper.write(Type.LONG, 0L); // Salt
             wrapper.write(Type.VAR_INT, 0); // No signatures
-            getChatAckHandler().handle(wrapper);
+            writeChatAck(wrapper);
         });
         cancelServerbound(ServerboundPackets1_20_5.CHAT_ACK);
 
@@ -145,13 +145,11 @@ public final class Protocol1_20_5To1_20_3 extends AbstractProtocol<ClientboundPa
         cancelServerbound(ServerboundPackets1_20_5.DEBUG_SAMPLE_SUBSCRIPTION);
     }
 
-    private PacketHandler getChatAckHandler() {
-        return wrapper -> {
-            final AcknowledgedMessagesStorage storage = wrapper.user().get(AcknowledgedMessagesStorage.class);
-            wrapper.write(Type.VAR_INT, storage.offset());
-            wrapper.write(Type.ACKNOWLEDGED_BIT_SET, storage.toAck());
-            storage.clearOffset();
-        };
+    private void writeChatAck(final PacketWrapper wrapper) {
+        final AcknowledgedMessagesStorage storage = wrapper.user().get(AcknowledgedMessagesStorage.class);
+        wrapper.write(Type.VAR_INT, storage.offset());
+        wrapper.write(Type.ACKNOWLEDGED_BIT_SET, storage.toAck());
+        storage.clearOffset();
     }
 
     @Override