Minecraft/mc-core
Archived
0
Fork 0
Code Activity

hotfix: Oops!

Browse Source
This commit is contained in:
DmitriyMX
2018-08-07 21:33:05 +03:00
parent 156984ea84
commit 2c611a888d
25 changed files with 107 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java
View File

@@ -8,14 +8,12 @@ import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import mc.core.Location;
import mc.core.network.NetOutputStream;
import mc.core.network.SCPacket;
import mc.core.network.proto_1_12_2.ByteArrayOutputNetStream;
import mc.core.world.Block;
import mc.core.world.Chunk;
import mc.core.world.block.Block;
import mc.core.world.chunk.Chunk;
import java.io.*;
import java.util.ArrayList;
import java.util.List;
@@ -80,8 +78,8 @@ public class ChunkDataPacket implements SCPacket {
@Getter
private List<Chunk> chunks = new ArrayList<>();
private int serializeBlockState(int id, int state) {
return (id << 4) | state;
private int serializeBlockState(int id, int meta) {
return (id << 4) | meta;
}
@Override
@@ -115,7 +113,7 @@ public class ChunkDataPacket implements SCPacket {
for (int z = 0; z < 16; z++) {
for (int x = 0; x < 16; x++) {
Block block = chunk.getBlock(x, y, z);
int blockState = serializeBlockState(block.getId(), block.getState());
int blockState = serializeBlockState(block.getId(), block.getMeta());
int currentIndexPaletteBlock;
if (!palette.contains(blockState)) {
@@ -151,7 +149,7 @@ public class ChunkDataPacket implements SCPacket {
}
if (!biomeFinally) {
biomes.writeByte(chunk.getBiome(x, z));
biomes.writeByte(chunk.getBiome(x, z).getId());
if (x == 15 && z == 15) {
biomeFinally = true;
}