Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-04 17:50:18 +01:00
Code Issues Projects Releases Wiki Activity

improve info on statelist length mismatch

Browse Source
This commit is contained in:
Pierre Kisters 2020-08-15 20:05:07 +02:00
parent 128d356655
commit 5e7d00e438
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fabric-1.16.1/src/main/java/org/dynmap/fabric_1_16_1/ChunkSnapshot.java
View File

@ -126,6 +126,17 @@ public class ChunkSnapshot {
}
public static class StateListException extends Exception {
private static boolean loggedOnce = false;
public StateListException(int x, int z, int expectedLength, int actualLength) {
if (Log.verbose || !loggedOnce) {
loggedOnce = true;
Log.info("Skipping chunk at x=" + x + ",z=" + z + ". Expected statelist of length " + expectedLength + " but got " + actualLength + ". This can happen if the chunk was not yet converted to the 1.16 format which can be fixed by visiting the chunk.");
if (!Log.verbose) {
Log.info("You will only see this message once. Turn on verbose logging in the configuration to see all messages.");
}
}
}
}
public ChunkSnapshot(CompoundTag nbt, int worldheight) throws StateListException {
@ -189,12 +200,8 @@ public class ChunkSnapshot {
int bitsperblock = (statelist.length * 64) / 4096;
int expectedStatelistLength = (4096 + (64 / bitsperblock) - 1) / (64 / bitsperblock);
if (expectedStatelistLength > statelist.length) { // TODO: find out why this is happening and why it doesn't seem to happen on other platforms
Log.warning("Got statelist of length " + statelist.length + " but expected a length of " + expectedStatelistLength + " at ChunkPos(x=" + x + ",z=" + z + ")");
throw new StateListException();
/*long[] expandedStatelist = new long[expectedStatelistLength];
System.arraycopy(statelist, 0, expandedStatelist, 0, statelist.length);
statelist = expandedStatelist;*/
if (expectedStatelistLength != statelist.length) {
throw new StateListException(x, z, expectedStatelistLength, statelist.length);
}
PackedIntegerArray db = new PackedIntegerArray(bitsperblock, 4096, statelist);

19
fabric-1.16.2/src/main/java/org/dynmap/fabric_1_16_2/ChunkSnapshot.java
View File

@ -126,6 +126,17 @@ public class ChunkSnapshot {
}
public static class StateListException extends Exception {
private static boolean loggedOnce = false;
public StateListException(int x, int z, int expectedLength, int actualLength) {
if (Log.verbose || !loggedOnce) {
loggedOnce = true;
Log.info("Skipping chunk at x=" + x + ",z=" + z + ". Expected statelist of length " + expectedLength + " but got " + actualLength + ". This can happen if the chunk was not yet converted to the 1.16 format which can be fixed by visiting the chunk.");
if (!Log.verbose) {
Log.info("You will only see this message once. Turn on verbose logging in the configuration to see all messages.");
}
}
}
}
public ChunkSnapshot(CompoundTag nbt, int worldheight) throws StateListException {
@ -189,12 +200,8 @@ public class ChunkSnapshot {
int bitsperblock = (statelist.length * 64) / 4096;
int expectedStatelistLength = (4096 + (64 / bitsperblock) - 1) / (64 / bitsperblock);
if (expectedStatelistLength > statelist.length) { // TODO: find out why this is happening and why it doesn't seem to happen on other platforms
Log.warning("Got statelist of length " + statelist.length + " but expected a length of " + expectedStatelistLength + " at ChunkPos(x=" + x + ",z=" + z + ")");
throw new StateListException();
/*long[] expandedStatelist = new long[expectedStatelistLength];
System.arraycopy(statelist, 0, expandedStatelist, 0, statelist.length);
statelist = expandedStatelist;*/
if (expectedStatelistLength != statelist.length) {
throw new StateListException(x, z, expectedStatelistLength, statelist.length);
}
PackedIntegerArray db = new PackedIntegerArray(bitsperblock, 4096, statelist);