diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_4to1_20/Protocol1_19_4To1_20.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_4to1_20/Protocol1_19_4To1_20.java
index ef1dd980e..69a98687f 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_4to1_20/Protocol1_19_4To1_20.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_19_4to1_20/Protocol1_19_4To1_20.java
@@ -63,7 +63,7 @@ public final class Protocol1_19_4To1_20 extends AbstractProtocol<ClientboundPack
             wrapper.read(Types.INT); // Killer ID
         });
         registerClientbound(ClientboundPackets1_19_4.PLAYER_COMBAT_KILL, wrapper -> {
-            wrapper.passthrough(Types.VAR_INT); // Duration
+            wrapper.passthrough(Types.VAR_INT); // Player ID
             wrapper.read(Types.INT); // Killer ID
         });
     }
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/Protocol1_20_2To1_20_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/Protocol1_20_2To1_20_3.java
index 410c93136..f0397f9a1 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/Protocol1_20_2To1_20_3.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_2to1_20_3/Protocol1_20_2To1_20_3.java
@@ -258,7 +258,7 @@ public final class Protocol1_20_2To1_20_3 extends AbstractProtocol<ClientboundPa
         registerClientbound(ClientboundPackets1_20_2.PLAYER_COMBAT_KILL, new PacketHandlers() {
             @Override
             public void register() {
-                map(Types.VAR_INT); // Duration
+                map(Types.VAR_INT); // Player ID
                 handler(wrapper -> convertComponent(wrapper));
             }
         });
diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/ComponentRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/ComponentRewriter.java
index 0e4b82598..faec8191c 100644
--- a/common/src/main/java/com/viaversion/viaversion/rewriter/ComponentRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/ComponentRewriter.java
@@ -85,8 +85,8 @@ public class ComponentRewriter<C extends ClientboundPacketType> implements com.v
     public void registerPlayerCombat(final C packetType) {
         protocol.registerClientbound(packetType, wrapper -> {
             if (wrapper.passthrough(Types.VAR_INT) == 2) {
-                wrapper.passthrough(Types.VAR_INT);
-                wrapper.passthrough(Types.INT);
+                wrapper.passthrough(Types.VAR_INT); // Player ID
+                wrapper.passthrough(Types.INT); // Killer ID
                 processText(wrapper.user(), wrapper.passthrough(Types.COMPONENT));
             }
         });
@@ -142,8 +142,8 @@ public class ComponentRewriter<C extends ClientboundPacketType> implements com.v
         protocol.registerClientbound(packetType, new PacketHandlers() {
             @Override
             public void register() {
-                map(Types.VAR_INT);
-                map(Types.INT);
+                map(Types.VAR_INT); // Player ID
+                map(Types.INT); // Killer ID
                 handler(wrapper -> processText(wrapper.user(), wrapper.passthrough(Types.COMPONENT)));
             }
         });
@@ -153,7 +153,7 @@ public class ComponentRewriter<C extends ClientboundPacketType> implements com.v
         protocol.registerClientbound(packetType, new PacketHandlers() {
             @Override
             public void register() {
-                map(Types.VAR_INT); // Duration
+                map(Types.VAR_INT); // Player ID
                 handler(wrapper -> passthroughAndProcess(wrapper));
             }
         });