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

Handle chunks with no biome data

Browse source
This commit is contained in:
Mike Primm 2018-09-05 19:48:14 -05:00
parent 288a7ad9ea
commit 499d78a0a9
5 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
forge-1.10.2/src/main/java/org/dynmap/forge_1_10_2/ChunkSnapshot.java
View file

@ -9,6 +9,7 @@ import org.dynmap.renderer.DynmapBlockState;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagList;
import net.minecraft.world.chunk.NibbleArray; import net.minecraft.world.chunk.NibbleArray;
import scala.actors.threadpool.Arrays;
/** /**
* Represents a static, thread-safe snapshot of chunk of blocks * Represents a static, thread-safe snapshot of chunk of blocks
@ -154,7 +155,11 @@ public class ChunkSnapshot
} }
/* Get biome data */ /* Get biome data */
if (nbt.hasKey("Biomes")) { if (nbt.hasKey("Biomes")) {
this.biome = nbt.getByteArray("Biomes"); byte[] b = nbt.getByteArray("Biomes");
if (b.length < COLUMNS_PER_CHUNK) {
b = Arrays.copyOf(b, COLUMNS_PER_CHUNK);
}
this.biome = b;
} }
else { else {
this.biome = new byte[COLUMNS_PER_CHUNK]; this.biome = new byte[COLUMNS_PER_CHUNK];

7
forge-1.11.2/src/main/java/org/dynmap/forge_1_11_2/ChunkSnapshot.java
View file

@ -9,6 +9,7 @@ import org.dynmap.renderer.DynmapBlockState;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagList;
import net.minecraft.world.chunk.NibbleArray; import net.minecraft.world.chunk.NibbleArray;
import scala.actors.threadpool.Arrays;
/** /**
* Represents a static, thread-safe snapshot of chunk of blocks * Represents a static, thread-safe snapshot of chunk of blocks
@ -154,7 +155,11 @@ public class ChunkSnapshot
} }
/* Get biome data */ /* Get biome data */
if (nbt.hasKey("Biomes")) { if (nbt.hasKey("Biomes")) {
this.biome = nbt.getByteArray("Biomes"); byte[] b = nbt.getByteArray("Biomes");
if (b.length < COLUMNS_PER_CHUNK) {
b = Arrays.copyOf(b, COLUMNS_PER_CHUNK);
}
this.biome = b;
} }
else { else {
this.biome = new byte[COLUMNS_PER_CHUNK]; this.biome = new byte[COLUMNS_PER_CHUNK];

7
forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/ChunkSnapshot.java
View file

@ -9,6 +9,7 @@ import org.dynmap.renderer.DynmapBlockState;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagList;
import net.minecraft.world.chunk.NibbleArray; import net.minecraft.world.chunk.NibbleArray;
import scala.actors.threadpool.Arrays;
/** /**
* Represents a static, thread-safe snapshot of chunk of blocks * Represents a static, thread-safe snapshot of chunk of blocks
@ -154,7 +155,11 @@ public class ChunkSnapshot
} }
/* Get biome data */ /* Get biome data */
if (nbt.hasKey("Biomes")) { if (nbt.hasKey("Biomes")) {
this.biome = nbt.getByteArray("Biomes"); byte[] b = nbt.getByteArray("Biomes");
if (b.length < COLUMNS_PER_CHUNK) {
b = Arrays.copyOf(b, COLUMNS_PER_CHUNK);
}
this.biome = b;
} }
else { else {
this.biome = new byte[COLUMNS_PER_CHUNK]; this.biome = new byte[COLUMNS_PER_CHUNK];

7
forge-1.8.9/src/main/java/org/dynmap/forge_1_8_9/ChunkSnapshot.java
View file

@ -11,6 +11,7 @@ import net.minecraft.nbt.NBTTagList;
import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.NibbleArray; import net.minecraft.world.chunk.NibbleArray;
import net.minecraft.world.chunk.storage.ExtendedBlockStorage; import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
import scala.actors.threadpool.Arrays;
/** /**
* Represents a static, thread-safe snapshot of chunk of blocks * Represents a static, thread-safe snapshot of chunk of blocks
@ -156,7 +157,11 @@ public class ChunkSnapshot
} }
/* Get biome data */ /* Get biome data */
if (nbt.hasKey("Biomes")) { if (nbt.hasKey("Biomes")) {
this.biome = nbt.getByteArray("Biomes"); byte[] b = nbt.getByteArray("Biomes");
if (b.length < COLUMNS_PER_CHUNK) {
b = Arrays.copyOf(b, COLUMNS_PER_CHUNK);
}
this.biome = b;
} }
else { else {
this.biome = new byte[COLUMNS_PER_CHUNK]; this.biome = new byte[COLUMNS_PER_CHUNK];

7
forge-1.9.4/src/main/java/org/dynmap/forge_1_9_4/ChunkSnapshot.java
View file

@ -9,6 +9,7 @@ import org.dynmap.renderer.DynmapBlockState;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagList;
import net.minecraft.world.chunk.NibbleArray; import net.minecraft.world.chunk.NibbleArray;
import scala.actors.threadpool.Arrays;
/** /**
* Represents a static, thread-safe snapshot of chunk of blocks * Represents a static, thread-safe snapshot of chunk of blocks
@ -154,7 +155,11 @@ public class ChunkSnapshot
} }
/* Get biome data */ /* Get biome data */
if (nbt.hasKey("Biomes")) { if (nbt.hasKey("Biomes")) {
this.biome = nbt.getByteArray("Biomes"); byte[] b = nbt.getByteArray("Biomes");
if (b.length < COLUMNS_PER_CHUNK) {
b = Arrays.copyOf(b, COLUMNS_PER_CHUNK);
}
this.biome = b;
} }
else { else {
this.biome = new byte[COLUMNS_PER_CHUNK]; this.biome = new byte[COLUMNS_PER_CHUNK];