workaround for #17

lhns · Aug 14, 2020 · 1e76798 · 1e76798
1 parent 67a9ca4
commit 1e76798
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/java/org/dynmap/fabric_1_16_2/FabricMapChunkCache.java b/src/main/java/org/dynmap/fabric_1_16_2/FabricMapChunkCache.java
@@ -1097,7 +1097,12 @@ else if (cps.isChunkLoaded(chunk.x, chunk.z)) {
                 ChunkSnapshot ss;
                 DynIntHashMap tileData;
                 if (vis) {  // If visible 
-                    CompoundTag nbt = ChunkSerializer.serialize((ServerWorld) w, cps.getWorldChunk(chunk.x, chunk.z, false) /*TODO: NPE*/);
+                    CompoundTag nbt = null;
+                    try {
+                        nbt = ChunkSerializer.serialize((ServerWorld) w, cps.getWorldChunk(chunk.x, chunk.z, false));
+                    } catch (NullPointerException e) {
+                        Log.severe("ChunkSerializer.serialize threw a NullPointerException", e);
+                    }
                     if (nbt != null) nbt = nbt.getCompound("Level");
                     SnapshotCache.SnapshotRec ssr = prepChunkSnapshot(chunk, nbt);
                     ss = ssr.ss;