Upstream
/
dynmap
mirror of https://github.com/webbukkit/dynmap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix to reflect Bukkit's changes. Also fixes the threading-problems.

This commit is contained in:
FrozenCow 2011-01-15 21:44:27 +01:00
parent 6205aee3b6
commit 53e7ab73a0
3 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/dynmap/DynmapPlugin.java
View File

@ -22,8 +22,8 @@ public class DynmapPlugin extends JavaPlugin {
private BukkitPlayerDebugger debugger = new BukkitPlayerDebugger(this);
public DynmapPlugin(PluginLoader pluginLoader, Server instance, PluginDescriptionFile desc, File plugin, ClassLoader cLoader) {
super(pluginLoader, instance, desc, plugin, cLoader);
public DynmapPlugin(PluginLoader pluginLoader, Server instance, PluginDescriptionFile desc, File folder, File plugin, ClassLoader cLoader) {
super(pluginLoader, instance, desc, folder, plugin, cLoader);
}
public World getWorld() {

2
src/main/java/org/dynmap/kzedmap/CaveTileRenderer.java
View File

@ -22,7 +22,7 @@ public class CaveTileRenderer extends DefaultTileRenderer {
if(y < 0)
return Color.BLACK;
int id = world.getBlockAt(x, y, z).getTypeID();
int id = world.getBlockTypeIdAt(x, y, z);
switch(seq) {
case 0:

16
src/main/java/org/dynmap/kzedmap/DefaultTileRenderer.java
View File

@ -43,20 +43,6 @@ public class DefaultTileRenderer implements MapTileRenderer {
int iy = tile.my;
int iz = tile.mz;
Block block = tile.getMap().getWorld().getBlockAt(ix, iy, iz);
if (block == null) {
debugger.debug("Could not get block for rendering.");
return;
}
Chunk chunk = block.getChunk();
if (chunk == null) {
debugger.debug("Could not get chunk for rendering.");
return;
}
if (!world.isChunkLoaded(chunk)) {
debugger.debug("Chunk was not loaded, but we'll still continue render.");
}
int jx, jz;
int x, y;
@ -111,7 +97,7 @@ public class DefaultTileRenderer implements MapTileRenderer {
if(y < 0)
return Color.BLUE;
int id = world.getBlockAt(x, y, z).getTypeID();
int id = world.getBlockTypeIdAt(x, y, z);
switch(seq) {
case 0: