diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java index f2b6cc734..b46cc98ec 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java +++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java @@ -83,7 +83,7 @@ public class ProtocolVersion { public static final ProtocolVersion v1_19_1 = register(760, "1.19.1/2", new VersionRange("1.19", 1, 2)); public static final ProtocolVersion v1_19_3 = register(761, "1.19.3"); public static final ProtocolVersion v1_19_4 = register(762, "1.19.4"); - public static final ProtocolVersion v1_20 = register(763, 135, "1.20"); + public static final ProtocolVersion v1_20 = register(763, 136, "1.20"); public static final ProtocolVersion unknown = register(-1, "UNKNOWN"); public static ProtocolVersion register(int version, String name) { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20to1_19_4/Protocol1_20To1_19_4.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20to1_19_4/Protocol1_20To1_19_4.java index 787f884ee..6af502083 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20to1_19_4/Protocol1_20To1_19_4.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20to1_19_4/Protocol1_20To1_19_4.java @@ -22,6 +22,7 @@ import com.viaversion.viaversion.api.data.MappingData; import com.viaversion.viaversion.api.data.MappingDataBase; import com.viaversion.viaversion.api.minecraft.entities.Entity1_19_4Types; import com.viaversion.viaversion.api.protocol.AbstractProtocol; +import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.minecraft.ParticleType; import com.viaversion.viaversion.api.type.types.version.Types1_20; import com.viaversion.viaversion.data.entity.EntityTrackerBase; @@ -55,6 +56,15 @@ public final class Protocol1_20To1_19_4 extends AbstractProtocol(this).register(ClientboundPackets1_19_4.STATISTICS); + + registerClientbound(ClientboundPackets1_19_4.COMBAT_END, wrapper -> { + wrapper.passthrough(Type.VAR_INT); // Duration + wrapper.read(Type.INT); // Killer ID + }); + registerClientbound(ClientboundPackets1_19_4.COMBAT_KILL, wrapper -> { + wrapper.passthrough(Type.VAR_INT); // Duration + wrapper.read(Type.INT); // Killer ID + }); } @Override diff --git a/gradle.properties b/gradle.properties index dda9a07c0..ad6cc2467 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Project properties - we put these here so they can be modified without causing a recompile of the build scripts -projectVersion=4.7.0-1.20-pre2-SNAPSHOT +projectVersion=4.7.0-1.20-pre3-SNAPSHOT # Gradle properties org.gradle.daemon=true