Mirrors/ViaVersion
3
0
Fork 1
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-11-08 17:20:24 +01:00
Code Issues Releases Aktivität

Minor optimization

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Nassim Jahnke 2021-10-29 17:47:38 +02:00
Ursprung a8c6f6b783
Commit 95493f3bbe
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 6BE3B555EBC5982B
1 geänderte Dateien mit 12 neuen und 13 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

25
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/WorldPackets.java
Datei anzeigen

@ -106,22 +106,22 @@ public final class WorldPackets {
final List<BlockEntity> blockEntities = new ArrayList<>(oldChunk.getBlockEntities().size()); final List<BlockEntity> blockEntities = new ArrayList<>(oldChunk.getBlockEntities().size());
for (final CompoundTag tag : oldChunk.getBlockEntities()) { for (final CompoundTag tag : oldChunk.getBlockEntities()) {
if (!tag.contains("x") || !tag.contains("y") || !tag.contains("z") || !tag.contains("id")) { final NumberTag xTag = tag.get("x");
final NumberTag yTag = tag.get("y");
final NumberTag zTag = tag.get("z");
final StringTag idTag = tag.get("id");
if (xTag == null || yTag == null || zTag == null || idTag == null) {
continue; continue;
} }
final int x = ((NumberTag) tag.get("x")).asInt(); final String id = idTag.getValue();
final int z = ((NumberTag) tag.get("z")).asInt();
final byte packedXZ = (byte) ((x & 15) << 4 | (z & 15));
final short y = ((NumberTag) tag.get("y")).asShort();
final String id = ((StringTag) tag.get("id")).getValue();
final int typeId = protocol.getMappingData().blockEntityIds().getInt(id.replace("minecraft:", "")); final int typeId = protocol.getMappingData().blockEntityIds().getInt(id.replace("minecraft:", ""));
if (typeId == -1) { if (typeId == -1) {
Via.getPlatform().getLogger().warning("Unknown block entity: " + id); Via.getPlatform().getLogger().warning("Unknown block entity: " + id);
} }
blockEntities.add(new BlockEntityImpl(packedXZ, y, typeId, tag)); final byte packedXZ = (byte) ((xTag.asInt() & 15) << 4 | (zTag.asInt() & 15));
blockEntities.add(new BlockEntityImpl(packedXZ, yTag.asShort(), typeId, tag));
} }
final int[] biomeData = oldChunk.getBiomeData(); final int[] biomeData = oldChunk.getBiomeData();
@ -150,8 +150,8 @@ public final class WorldPackets {
section.addPalette(PaletteType.BIOMES, biomePalette); section.addPalette(PaletteType.BIOMES, biomePalette);
final int offset = i * ChunkSection.BIOME_SIZE; final int offset = i * ChunkSection.BIOME_SIZE;
for (int biomeIndex = 0; biomeIndex < ChunkSection.BIOME_SIZE; biomeIndex++) { for (int biomeIndex = 0, biomeArrayIndex = offset; biomeIndex < ChunkSection.BIOME_SIZE; biomeIndex++, biomeArrayIndex++) {
biomePalette.setIdAt(biomeIndex, biomeData[offset + biomeIndex]); biomePalette.setIdAt(biomeIndex, biomeData[biomeArrayIndex]);
} }
} }
@ -161,8 +161,7 @@ public final class WorldPackets {
MathUtil.ceilLog2(tracker.biomesSent())), chunk); MathUtil.ceilLog2(tracker.biomesSent())), chunk);
final ChunkLightStorage lightStorage = wrapper.user().get(ChunkLightStorage.class); final ChunkLightStorage lightStorage = wrapper.user().get(ChunkLightStorage.class);
// Mark chunk as loaded final boolean alreadyLoaded = !lightStorage.addLoadedChunk(chunk.getX(), chunk.getZ());
boolean alreadyLoaded = !lightStorage.addLoadedChunk(chunk.getX(), chunk.getZ());
// Get and remove light stored, there's only full chunk packets //TODO Only get, not remove if we find out people re-send full chunk packets without re-sending light // Get and remove light stored, there's only full chunk packets //TODO Only get, not remove if we find out people re-send full chunk packets without re-sending light
// Append light data to chunk packet // Append light data to chunk packet
@ -170,7 +169,7 @@ public final class WorldPackets {
if (light == null) { if (light == null) {
Via.getPlatform().getLogger().warning("No light data found for chunk at " + chunk.getX() + ", " + chunk.getZ() + ". Chunk was already loaded: " + alreadyLoaded); Via.getPlatform().getLogger().warning("No light data found for chunk at " + chunk.getX() + ", " + chunk.getZ() + ". Chunk was already loaded: " + alreadyLoaded);
BitSet emptyLightMask = new BitSet(); final BitSet emptyLightMask = new BitSet();
emptyLightMask.set(0, tracker.currentWorldSectionHeight() + 2); emptyLightMask.set(0, tracker.currentWorldSectionHeight() + 2);
wrapper.write(Type.BOOLEAN, false); wrapper.write(Type.BOOLEAN, false);
wrapper.write(Type.LONG_ARRAY_PRIMITIVE, new long[0]); wrapper.write(Type.LONG_ARRAY_PRIMITIVE, new long[0]);