Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Imrpove chunk state handling

Browse source
This commit is contained in:
Mike Primm 2020-05-03 21:13:20 -05:00
parent 1815b2a911
commit 2c8ae6fb16
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bukkit-helper-114-1/src/main/java/org/dynmap/bukkit/helper/v114_1/MapChunkCache114_1.java
View file

@ -21,6 +21,7 @@ import org.dynmap.utils.VisibilityLimit;
import net.minecraft.server.v1_14_R1.Chunk; import net.minecraft.server.v1_14_R1.Chunk;
import net.minecraft.server.v1_14_R1.ChunkCoordIntPair; import net.minecraft.server.v1_14_R1.ChunkCoordIntPair;
import net.minecraft.server.v1_14_R1.ChunkRegionLoader; 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.DataBits;
import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.NBTTagCompound;
import net.minecraft.server.v1_14_R1.NBTTagList; import net.minecraft.server.v1_14_R1.NBTTagList;
@ -301,7 +302,8 @@ public class MapChunkCache114_1 extends AbstractMapChunkCache {
nbt = nbt.getCompound("Level"); nbt = nbt.getCompound("Level");
if (nbt != null) { if (nbt != null) {
String stat = nbt.getString("Status"); 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; nbt = null;
} }
} }

6
bukkit-helper-114/src/main/java/org/dynmap/bukkit/helper/v114/MapChunkCache114.java
View file

@ -21,6 +21,7 @@ import org.dynmap.utils.VisibilityLimit;
import net.minecraft.server.v1_14_R1.Chunk; import net.minecraft.server.v1_14_R1.Chunk;
import net.minecraft.server.v1_14_R1.ChunkCoordIntPair; import net.minecraft.server.v1_14_R1.ChunkCoordIntPair;
import net.minecraft.server.v1_14_R1.ChunkRegionLoader; 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.DataBits;
import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.NBTTagCompound;
import net.minecraft.server.v1_14_R1.NBTTagList; import net.minecraft.server.v1_14_R1.NBTTagList;
@ -320,8 +321,9 @@ public class MapChunkCache114 extends AbstractMapChunkCache {
if (nbt != null) { if (nbt != null) {
nbt = nbt.getCompound("Level"); nbt = nbt.getCompound("Level");
if (nbt != null) { if (nbt != null) {
String stat = nbt.getString("Status"); 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; nbt = null;
if ((stat == null) || stat.equals("") && DynmapCore.migrateChunks()) { if ((stat == null) || stat.equals("") && DynmapCore.migrateChunks()) {
Chunk c = cw.getHandle().getChunkAt(x, z); Chunk c = cw.getHandle().getChunkAt(x, z);

4
bukkit-helper-115/src/main/java/org/dynmap/bukkit/helper/v115/MapChunkCache115.java
View file

@ -23,6 +23,7 @@ import org.dynmap.utils.VisibilityLimit;
import net.minecraft.server.v1_15_R1.Chunk; import net.minecraft.server.v1_15_R1.Chunk;
import net.minecraft.server.v1_15_R1.ChunkCoordIntPair; import net.minecraft.server.v1_15_R1.ChunkCoordIntPair;
import net.minecraft.server.v1_15_R1.ChunkRegionLoader; 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.DataBits;
import net.minecraft.server.v1_15_R1.NBTTagCompound; import net.minecraft.server.v1_15_R1.NBTTagCompound;
import net.minecraft.server.v1_15_R1.NBTTagList; import net.minecraft.server.v1_15_R1.NBTTagList;
@ -317,7 +318,8 @@ public class MapChunkCache115 extends AbstractMapChunkCache {
nbt = nbt.getCompound("Level"); nbt = nbt.getCompound("Level");
if (nbt != null) { if (nbt != null) {
String stat = nbt.getString("Status"); 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; nbt = null;
} }
} }