DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly handle non-full chunks in QuickReplaySender

Browse Source
This commit is contained in:
Jonas Herzig
2018-12-18 09:50:50 +01:00
parent c8ecd17fe9
commit e989b60ea8
1 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/replaymod/replay/QuickReplaySender.java
View File

@@ -404,12 +404,41 @@ public class QuickReplaySender extends ChannelHandlerAdapter implements ReplaySe
} }
} else if (packet instanceof ServerChunkDataPacket) { } else if (packet instanceof ServerChunkDataPacket) {
Column column = ((ServerChunkDataPacket) packet).getColumn(); Column column = ((ServerChunkDataPacket) packet).getColumn();
if (column.hasBiomeData()) {
Chunk chunk = new Chunk(column); Chunk chunk = new Chunk(column);
chunk.spawnTime = time; chunk.spawnTime = time;
Chunk prev = activeChunks.put(coordToLong(column.getX(), column.getZ()), chunk); Chunk prev = activeChunks.put(coordToLong(column.getX(), column.getZ()), chunk);
if (prev != null) { if (prev != null) {
index = prev.writeToCache(indexOut, out, time, index); index = prev.writeToCache(indexOut, out, time, index);
} }
} else {
Chunk chunk = activeChunks.get(coordToLong(column.getX(), column.getZ()));
if (chunk != null) {
int sectionY = 0;
for (com.github.steveice10.mc.protocol.data.game.chunk.Chunk section : column.getChunks()) {
if (section == null) {
sectionY++;
continue;
}
BlockStorage toBlocks = section.getBlocks();
BlockStorage fromBlocks = chunk.currentBlockState[sectionY];
for (int y = 0; y < 16; y++) {
for (int z = 0; z < 16; z++) {
for (int x = 0; x < 16; x++) {
BlockState fromState = fromBlocks.get(x, y, z);
BlockState toState = toBlocks.get(x, y, z);
if (!fromState.equals(toState)) {
Position pos = new Position(column.getX() << 4 | x, sectionY << 4 | y, column.getZ() << 4 | z);
chunk.blocks.put(time, new BlockChange(pos, fromState, toState));
}
}
}
}
chunk.currentBlockState[sectionY] = toBlocks;
sectionY++;
}
}
}
} else if (packet instanceof ServerUnloadChunkPacket) { } else if (packet instanceof ServerUnloadChunkPacket) {
ServerUnloadChunkPacket p = (ServerUnloadChunkPacket) packet; ServerUnloadChunkPacket p = (ServerUnloadChunkPacket) packet;
Chunk prev = activeChunks.remove(coordToLong(p.getX(), p.getZ())); Chunk prev = activeChunks.remove(coordToLong(p.getX(), p.getZ()));