Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-28 13:15:30 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #239 from mikeprimm/master

Browse Source 
Add support for 'chunkgenerated' render trigger, now that CB has functional chunk generate events
This commit is contained in:
mikeprimm 2011-06-24 17:14:16 -07:00
commit 3310e07c9b
2 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configuration.txt
View File

@ -89,6 +89,7 @@ render-triggers:
- snowform - snowform
- leavesdecay - leavesdecay
- blockburn - blockburn
- chunkgenerated
# The path where the tile-files are placed. # The path where the tile-files are placed.
tilespath: web/tiles tilespath: web/tiles

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

@ -52,6 +52,7 @@ public class DynmapPlugin extends JavaPlugin {
public Events events = new Events(); public Events events = new Events();
/* Flag to let code know that we're doing reload - make sure we don't double-register event handlers */ /* Flag to let code know that we're doing reload - make sure we don't double-register event handlers */
public boolean is_reload = false; public boolean is_reload = false;
private boolean generate_only = false;
public static File dataDirectory; public static File dataDirectory;
public static File tilesDirectory; public static File tilesDirectory;
@ -247,21 +248,44 @@ public class DynmapPlugin extends JavaPlugin {
WorldListener renderTrigger = new WorldListener() { WorldListener renderTrigger = new WorldListener() {
@Override @Override
public void onChunkLoad(ChunkLoadEvent event) { public void onChunkLoad(ChunkLoadEvent event) {
if(generate_only) {
if(!isNewChunk(event))
return;
/* Touch extreme corners */
int x = event.getChunk().getX() * 16;
int z = event.getChunk().getZ() * 16;
mm.touch(new Location(event.getWorld(), x, 0, z));
mm.touch(new Location(event.getWorld(), x+15, 127, z));
mm.touch(new Location(event.getWorld(), x+15, 0, z+15));
mm.touch(new Location(event.getWorld(), x, 127, z+15));
}
else {
int x = event.getChunk().getX() * 16 + 8; int x = event.getChunk().getX() * 16 + 8;
int z = event.getChunk().getZ() * 16 + 8; int z = event.getChunk().getZ() * 16 + 8;
mm.touch(new Location(event.getWorld(), x, 127, z)); mm.touch(new Location(event.getWorld(), x, 127, z));
} }
}
/* private boolean isNewChunk(ChunkLoadEvent event) {
* @Override public void onChunkGenerated(ChunkLoadEvent event) return event.isNewChunk();
* { int x = event.getChunk().getX() * 16 + 8; int z = }
* event.getChunk().getZ() * 16 + 8; mm.touch(new
* Location(event.getWorld(), x, 127, z)); }
*/
}; };
if (isTrigger("chunkloaded")) boolean ongenerate = isTrigger("chunkgenerated");
if(ongenerate) {
try { /* Test if new enough bukkit to allow this */
ChunkLoadEvent.class.getDeclaredMethod("isNewChunk", new Class[0]);
} catch (NoSuchMethodException nsmx) {
Log.info("Warning: CraftBukkit build does not support function needed for 'chunkgenerated' trigger - disabling");
ongenerate = false;
}
}
if(isTrigger("chunkloaded")) {
generate_only = false;
pm.registerEvent(org.bukkit.event.Event.Type.CHUNK_LOAD, renderTrigger, org.bukkit.event.Event.Priority.Monitor, this); pm.registerEvent(org.bukkit.event.Event.Type.CHUNK_LOAD, renderTrigger, org.bukkit.event.Event.Priority.Monitor, this);
//if (isTrigger("chunkgenerated")) pm.registerEvent(Event.Type.CHUNK_GENERATED, renderTrigger, Priority.Monitor, this); }
else if(ongenerate) {
generate_only = true;
pm.registerEvent(org.bukkit.event.Event.Type.CHUNK_LOAD, renderTrigger, org.bukkit.event.Event.Priority.Monitor, this);
}
} }
// To link configuration to real loaded worlds. // To link configuration to real loaded worlds.