From 965e2530ec7f84053d7d5490f9e6eaabbbf1227e Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 3 May 2020 21:13:20 -0500 Subject: [PATCH] Imrpove chunk state handling --- .../org/dynmap/bukkit/helper/v114_1/MapChunkCache114_1.java | 4 +++- .../org/dynmap/bukkit/helper/v114/MapChunkCache114.java | 6 ++++-- .../org/dynmap/bukkit/helper/v115/MapChunkCache115.java | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/bukkit-helper-114-1/src/main/java/org/dynmap/bukkit/helper/v114_1/MapChunkCache114_1.java b/bukkit-helper-114-1/src/main/java/org/dynmap/bukkit/helper/v114_1/MapChunkCache114_1.java index bff65025..b1a2e5f6 100644 --- a/bukkit-helper-114-1/src/main/java/org/dynmap/bukkit/helper/v114_1/MapChunkCache114_1.java +++ b/bukkit-helper-114-1/src/main/java/org/dynmap/bukkit/helper/v114_1/MapChunkCache114_1.java @@ -21,6 +21,7 @@ import org.dynmap.utils.VisibilityLimit; import net.minecraft.server.v1_14_R1.Chunk; import net.minecraft.server.v1_14_R1.ChunkCoordIntPair; import net.minecraft.server.v1_14_R1.ChunkRegionLoader; +import net.minecraft.server.v1_14_R1.ChunkStatus; import net.minecraft.server.v1_14_R1.DataBits; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.NBTTagList; @@ -301,7 +302,8 @@ public class MapChunkCache114_1 extends AbstractMapChunkCache { nbt = nbt.getCompound("Level"); if (nbt != null) { String stat = nbt.getString("Status"); - if ((stat == null) || (stat.equals("full") == false)) { + ChunkStatus cs = ChunkStatus.a(stat); + if ((stat == null) || (!cs.b(ChunkStatus.LIGHT))) { nbt = null; } } diff --git a/bukkit-helper-114/src/main/java/org/dynmap/bukkit/helper/v114/MapChunkCache114.java b/bukkit-helper-114/src/main/java/org/dynmap/bukkit/helper/v114/MapChunkCache114.java index d60d1f66..87ad9ba7 100644 --- a/bukkit-helper-114/src/main/java/org/dynmap/bukkit/helper/v114/MapChunkCache114.java +++ b/bukkit-helper-114/src/main/java/org/dynmap/bukkit/helper/v114/MapChunkCache114.java @@ -21,6 +21,7 @@ import org.dynmap.utils.VisibilityLimit; import net.minecraft.server.v1_14_R1.Chunk; import net.minecraft.server.v1_14_R1.ChunkCoordIntPair; import net.minecraft.server.v1_14_R1.ChunkRegionLoader; +import net.minecraft.server.v1_14_R1.ChunkStatus; import net.minecraft.server.v1_14_R1.DataBits; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.NBTTagList; @@ -320,8 +321,9 @@ public class MapChunkCache114 extends AbstractMapChunkCache { if (nbt != null) { nbt = nbt.getCompound("Level"); if (nbt != null) { - String stat = nbt.getString("Status"); - if ((stat == null) || (stat.equals("full") == false)) { + String stat = nbt.getString("Status"); + ChunkStatus cs = ChunkStatus.a(stat); + if ((stat == null) || (!cs.b(ChunkStatus.LIGHT))) { nbt = null; if ((stat == null) || stat.equals("") && DynmapCore.migrateChunks()) { Chunk c = cw.getHandle().getChunkAt(x, z); diff --git a/bukkit-helper-115/src/main/java/org/dynmap/bukkit/helper/v115/MapChunkCache115.java b/bukkit-helper-115/src/main/java/org/dynmap/bukkit/helper/v115/MapChunkCache115.java index cf0a07eb..bb261a4d 100644 --- a/bukkit-helper-115/src/main/java/org/dynmap/bukkit/helper/v115/MapChunkCache115.java +++ b/bukkit-helper-115/src/main/java/org/dynmap/bukkit/helper/v115/MapChunkCache115.java @@ -23,6 +23,7 @@ import org.dynmap.utils.VisibilityLimit; import net.minecraft.server.v1_15_R1.Chunk; import net.minecraft.server.v1_15_R1.ChunkCoordIntPair; import net.minecraft.server.v1_15_R1.ChunkRegionLoader; +import net.minecraft.server.v1_15_R1.ChunkStatus; import net.minecraft.server.v1_15_R1.DataBits; import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.NBTTagList; @@ -317,7 +318,8 @@ public class MapChunkCache115 extends AbstractMapChunkCache { nbt = nbt.getCompound("Level"); if (nbt != null) { String stat = nbt.getString("Status"); - if ((stat == null) || (stat.equals("full") == false)) { + ChunkStatus cs = ChunkStatus.a(stat); + if ((stat == null) || (!cs.b(ChunkStatus.LIGHT))) { nbt = null; } }