Skip to content

Commit a90c6db

Browse files
committed
Fix SubChunkPacket serialization
1 parent 9e1991c commit a90c6db

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

bedrock/bedrock-v471/src/main/java/com/nukkitx/protocol/bedrock/v471/serializer/SubChunkSerializer_v471.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,19 @@
1212

1313
@NoArgsConstructor(access = AccessLevel.PROTECTED)
1414
public class SubChunkSerializer_v471 implements BedrockPacketSerializer<SubChunkPacket> {
15+
1516
public static final SubChunkSerializer_v471 INSTANCE = new SubChunkSerializer_v471();
1617

18+
protected static final int HEIGHT_MAP_LENGTH = 256;
19+
1720
@Override
1821
public void serialize(ByteBuf buffer, BedrockPacketHelper helper, SubChunkPacket packet) {
1922
VarInts.writeInt(buffer, packet.getDimension());
2023
helper.writeVector3i(buffer, packet.getSubChunkPosition());
2124
helper.writeByteArray(buffer, packet.getData());
2225
VarInts.writeInt(buffer, packet.getResult().ordinal());
2326
buffer.writeByte(packet.getHeightMapType().ordinal());
24-
buffer.writeBytes(packet.getHeightMapData());
27+
buffer.writeBytes(packet.getHeightMapData(), 0, HEIGHT_MAP_LENGTH);
2528
}
2629

2730
@Override
@@ -32,9 +35,8 @@ public void deserialize(ByteBuf buffer, BedrockPacketHelper helper, SubChunkPack
3235
packet.setResult(SubChunkRequestResult.values()[VarInts.readInt(buffer)]);
3336
packet.setHeightMapType(HeightMapDataType.values()[buffer.readByte()]);
3437

35-
ByteBuf heightMapBuffer = buffer.readBytes(buffer.readableBytes());
36-
byte[] heightMap = new byte[heightMapBuffer.readableBytes()];
37-
heightMapBuffer.readBytes(heightMap);
38+
byte[] heightMap = new byte[HEIGHT_MAP_LENGTH];
39+
buffer.readBytes(heightMap);
3840

3941
packet.setHeightMapData(heightMap);
4042
}

bedrock/bedrock-v475/src/main/java/com/nukkitx/protocol/bedrock/v475/serializer/SubChunkSerializer_v475.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void serialize(ByteBuf buffer, BedrockPacketHelper helper, SubChunkPacket
2020
buffer.writeByte(packet.getHeightMapType().ordinal());
2121
if (packet.getHeightMapType() == HeightMapDataType.HAS_DATA) {
2222
byte[] heightMapBuf = packet.getHeightMapData();
23-
buffer.writeBytes(heightMapBuf);
23+
buffer.writeBytes(heightMapBuf, 0, HEIGHT_MAP_LENGTH);
2424
}
2525
buffer.writeBoolean(packet.isCacheEnabled());
2626
if (packet.isCacheEnabled()) {
@@ -37,9 +37,8 @@ public void deserialize(ByteBuf buffer, BedrockPacketHelper helper, SubChunkPack
3737
packet.setHeightMapType(HeightMapDataType.values()[buffer.readByte()]);
3838

3939
if (packet.getHeightMapType() == HeightMapDataType.HAS_DATA) {
40-
ByteBuf heightMapBuffer = buffer.readBytes(buffer.readableBytes());
41-
byte[] heightMap = new byte[heightMapBuffer.readableBytes()];
42-
heightMapBuffer.readBytes(heightMap);
40+
byte[] heightMap = new byte[HEIGHT_MAP_LENGTH];
41+
buffer.readBytes(heightMap);
4342
}
4443
packet.setCacheEnabled(buffer.readBoolean());
4544
if (packet.isCacheEnabled()) {

0 commit comments

Comments
 (0)