From 181fb9180e1f6871d4f916ff3b68bd15735fecb8 Mon Sep 17 00:00:00 2001 From: CoolLoong <1542536763@qq.com> Date: Tue, 25 Jun 2024 12:31:30 +0800 Subject: [PATCH] fix CHAINED_COMMAND in v662,685 --- .../cloudburstmc/protocol/bedrock/codec/v662/Bedrock_v662.java | 2 ++ .../cloudburstmc/protocol/bedrock/codec/v685/Bedrock_v685.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v662/Bedrock_v662.java b/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v662/Bedrock_v662.java index 0b9a4c8c1..8e533c94c 100644 --- a/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v662/Bedrock_v662.java +++ b/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v662/Bedrock_v662.java @@ -22,6 +22,7 @@ public class Bedrock_v662 extends Bedrock_v649 { protected static final TypeMap COMMAND_PARAMS = Bedrock_v649.COMMAND_PARAMS.toBuilder() + .remove(134217728)//remove CommandParam.CHAINED_COMMAND .shift(24, 4) .insert(24, CommandParam.RATIONAL_RANGE_VAL) .insert(25, CommandParam.RATIONAL_RANGE_POST_VAL) @@ -36,6 +37,7 @@ public class Bedrock_v662 extends Bedrock_v649 { .insert(53, CommandParam.HAS_PROPERTY_ELEMENT) .insert(54, CommandParam.HAS_PROPERTY_ELEMENTS) .insert(55, CommandParam.HAS_PROPERTY_SELECTOR) + .insert(134217728, CommandParam.CHAINED_COMMAND)//reinsert, avoid shift .build(); protected static final TypeMap PARTICLE_TYPES = Bedrock_v649.PARTICLE_TYPES diff --git a/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v685/Bedrock_v685.java b/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v685/Bedrock_v685.java index 6f0514fc1..9eb8af61f 100644 --- a/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v685/Bedrock_v685.java +++ b/bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v685/Bedrock_v685.java @@ -42,11 +42,13 @@ public class Bedrock_v685 extends Bedrock_v671 { .build(); protected static final TypeMap COMMAND_PARAMS = Bedrock_v671.COMMAND_PARAMS.toBuilder() + .remove(134217728)//remove CommandParam.CHAINED_COMMAND .shift(86, 4) .insert(86, CommandParam.CODE_BUILDER_ARG) .insert(87, CommandParam.CODE_BUILDER_ARGS) .insert(88, CommandParam.CODE_BUILDER_SELECT_PARAM) .insert(89, CommandParam.CODE_BUILDER_SELECTOR) + .insert(134217728, CommandParam.CHAINED_COMMAND)//reinsert, avoid shift .build(); protected static final EntityDataTypeMap ENTITY_DATA = Bedrock_v671.ENTITY_DATA