fix CHAINED_COMMAND in v662,685

CloudburstMC · Jun 25, 2024 · 181fb91 · 181fb91
1 parent 186efd6
commit 181fb91
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
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
@@ -22,6 +22,7 @@
 public class Bedrock_v662 extends Bedrock_v649 {
 
     protected static final TypeMap<CommandParam> 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<ParticleType> 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
@@ -42,11 +42,13 @@ public class Bedrock_v685 extends Bedrock_v671 {
             .build();
 
     protected static final TypeMap<CommandParam> 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