AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-12 08:58:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix chunk reading < 1.10. Print (version) mappings loading time

Browse Source
This commit is contained in:
Bixilon 2020-08-07 22:03:00 +02:00
parent deb700d33d
commit 00d38eb955
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/bixilon/minosoft/Minosoft.java
View File

@ -56,12 +56,14 @@ public class Minosoft {
checkAssets();
Log.info("Assets checking done");
Log.info("Loading versions.json...");
long mappingStartLoadingTime = System.currentTimeMillis();
try {
Versions.load(Util.readJsonFromFile(Config.homeDir + "assets/mapping/versions.json"));
} catch (IOException e) {
e.printStackTrace();
System.exit(1);
}
Log.info(String.format("Loaded versions mapping in %dms", (System.currentTimeMillis() - mappingStartLoadingTime)));
checkClientToken();

10
src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketChunkData.java
View File

@ -99,10 +99,12 @@ public class PacketChunkData implements ClientboundPacket {
// set position of the byte buffer, because of some reasons HyPixel makes some weired stuff and sends way to much 0 bytes. (~ 190k), thanks @pokechu22
buffer.setPosition(size + lastPos);
}
int blockEntitiesCount = buffer.readVarInt();
for (int i = 0; i < blockEntitiesCount; i++) {
CompoundTag tag = (CompoundTag) buffer.readNBT();
blockEntities.put(new BlockPosition(tag.getIntTag("x").getValue(), (short) tag.getIntTag("y").getValue(), tag.getIntTag("z").getValue()), tag);
if (buffer.getProtocolId() >= 110) {
int blockEntitiesCount = buffer.readVarInt();
for (int i = 0; i < blockEntitiesCount; i++) {
CompoundTag tag = (CompoundTag) buffer.readNBT();
blockEntities.put(new BlockPosition(tag.getIntTag("x").getValue(), (short) tag.getIntTag("y").getValue(), tag.getIntTag("z").getValue()), tag);
}
}
return true;
}