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

Fix handling of unknown biomes (For Trees++)

Browse source
This commit is contained in:
Mike Primm 2012-04-09 18:03:32 -05:00
parent a0a5b91872
commit 16ebb5da15
2 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/org/dynmap/bukkit/DynmapPlugin.java
View file

@ -825,6 +825,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
return; return;
Block b = event.getBlock(); Block b = event.getBlock();
Material m = b.getType(); Material m = b.getType();
if(m == null) return;
switch(m) { switch(m) {
case STATIONARY_WATER: case STATIONARY_WATER:
case WATER: case WATER:
@ -832,7 +833,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
case LAVA: case LAVA:
case GRAVEL: case GRAVEL:
case SAND: case SAND:
checkBlock(event.getBlock(), "blockphysics"); checkBlock(b, "blockphysics");
break; break;
} }
} }
@ -847,12 +848,14 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
public void onBlockFromTo(BlockFromToEvent event) { public void onBlockFromTo(BlockFromToEvent event) {
if(event.isCancelled()) if(event.isCancelled())
return; return;
Material m = event.getBlock().getType(); Block b = event.getBlock();
if((m != Material.WOOD_PLATE) && (m != Material.STONE_PLATE)) Material m = b.getType();
checkBlock(event.getBlock(), "blockfromto"); if((m != Material.WOOD_PLATE) && (m != Material.STONE_PLATE) && (m != null))
m = event.getToBlock().getType(); checkBlock(b, "blockfromto");
if((m != Material.WOOD_PLATE) && (m != Material.STONE_PLATE)) b = event.getToBlock();
checkBlock(event.getToBlock(), "blockfromto"); m = b.getType();
if((m != Material.WOOD_PLATE) && (m != Material.STONE_PLATE) && (m != null))
checkBlock(b, "blockfromto");
} }
}; };
pm.registerEvents(fromtolistener, this); pm.registerEvents(fromtolistener, this);

3
src/main/java/org/dynmap/bukkit/NewMapChunkCache.java
View file

@ -1060,6 +1060,9 @@ public class NewMapChunkCache implements MapChunkCache {
Biome[] b = Biome.values(); Biome[] b = Biome.values();
BiomeMap[] bm = BiomeMap.values(); BiomeMap[] bm = BiomeMap.values();
biome_to_bmap = new BiomeMap[b.length]; biome_to_bmap = new BiomeMap[b.length];
for(int i = 0; i < b.length; i++) {
biome_to_bmap[i] = BiomeMap.NULL;
}
for(int i = 0; i < b.length; i++) { for(int i = 0; i < b.length; i++) {
String bs = b[i].toString(); String bs = b[i].toString();
for(int j = 0; j < bm.length; j++) { for(int j = 0; j < bm.length; j++) {