mirror of
https://github.com/webbukkit/dynmap.git
synced 2024-11-14 14:25:21 +01:00
Restore biome data loading for non-normal (Bukkit is fixed), fix trap
This commit is contained in:
parent
abf909e047
commit
b5fed110ec
@ -94,7 +94,7 @@ public class TexturePackHDShader implements HDShader {
|
||||
c = new Color();
|
||||
scaledtp = tp.resampleTexturePack(map.getPerspective().getModelScale());
|
||||
/* Biome raw data only works on normal worlds at this point */
|
||||
do_biome_shading = biome_shaded && (cache.getWorld().getEnvironment() == Environment.NORMAL);
|
||||
do_biome_shading = biome_shaded; // && (cache.getWorld().getEnvironment() == Environment.NORMAL);
|
||||
do_swamp_shading = do_biome_shading && swamp_shaded;
|
||||
do_water_shading = do_biome_shading && waterbiomeshaded;
|
||||
}
|
||||
|
@ -377,9 +377,9 @@ public class NewMapChunkCache implements MapChunkCache {
|
||||
@SuppressWarnings({ "unchecked", "rawtypes" })
|
||||
public void setChunks(World w, List<DynmapChunk> chunks) {
|
||||
this.w = w;
|
||||
if(w.getEnvironment() != Environment.NORMAL) {
|
||||
biome = biomeraw = false;
|
||||
}
|
||||
//if(w.getEnvironment() != Environment.NORMAL) {
|
||||
// biome = biomeraw = false;
|
||||
//}
|
||||
this.chunks = chunks;
|
||||
if(poppreservedchunk == null) {
|
||||
/* Get CraftWorld.popPreservedChunk(x,z) - reduces memory bloat from map traversals (optional) */
|
||||
@ -423,7 +423,7 @@ public class NewMapChunkCache implements MapChunkCache {
|
||||
iterator = chunks.listIterator();
|
||||
|
||||
DynmapPlugin.setIgnoreChunkLoads(true);
|
||||
boolean isnormral = w.getEnvironment() == Environment.NORMAL;
|
||||
//boolean isnormral = w.getEnvironment() == Environment.NORMAL;
|
||||
// Load the required chunks.
|
||||
while((cnt < max_to_load) && iterator.hasNext()) {
|
||||
DynmapChunk chunk = iterator.next();
|
||||
@ -726,13 +726,13 @@ public class NewMapChunkCache implements MapChunkCache {
|
||||
}
|
||||
@Override
|
||||
public boolean setChunkDataTypes(boolean blockdata, boolean biome, boolean highestblocky, boolean rawbiome) {
|
||||
if((w != null) && (w.getEnvironment() != Environment.NORMAL)) {
|
||||
this.biome = this.biomeraw = false;
|
||||
}
|
||||
else {
|
||||
// if((w != null) && (w.getEnvironment() != Environment.NORMAL)) {
|
||||
// this.biome = this.biomeraw = false;
|
||||
// }
|
||||
// else {
|
||||
this.biome = biome;
|
||||
this.biomeraw = rawbiome;
|
||||
}
|
||||
// }
|
||||
this.highesty = highestblocky;
|
||||
this.blockdata = blockdata;
|
||||
return true;
|
||||
|
Loading…
Reference in New Issue
Block a user