Added multiworld update support along with client-side support.

src/main/java/org/dynmap/DynmapPlayerListener.java

@@ -66,6 +66,6 @@ public class DynmapPlayerListener extends PlayerListener {
      *            Relevant event details
      */
     public void onPlayerChat(PlayerChatEvent event) {
-        mgr.updateQueue.pushUpdate(new Client.ChatMessage(event.getPlayer().getName(), event.getMessage()));
+        mgr.pushUpdate(new Client.ChatMessage(event.getPlayer().getName(), event.getMessage()));
     }
 }

src/main/java/org/dynmap/MapManager.java

@@ -21,14 +21,16 @@ public class MapManager {
 
     private MapType[] mapTypes;
     public AsynchronousQueue<MapTile> tileQueue;
-    public UpdateQueue updateQueue;
+    
+    public Map<String, UpdateQueue> worldUpdateQueues = new HashMap<String, UpdateQueue>();
+    public ArrayList<String> worlds = new ArrayList<String>();
+    
     public PlayerList playerList;
 
     /* lock for our data structures */
     public static final Object lock = new Object();
 
     public MapManager(ConfigurationNode configuration) {
-        this.updateQueue = new UpdateQueue();
         this.tileQueue = new AsynchronousQueue<MapTile>(new Handler<MapTile>() {
             @Override
             public void handle(MapTile t) {
@@ -81,7 +83,6 @@ public class MapManager {
                 if (render(tile)) {
                     found.remove(tile);
                     rendered.add(tile);
-                    updateQueue.pushUpdate(new Client.Tile(tile.getFilename()));
                     for (MapTile adjTile : map.getAdjecentTiles(tile)) {
                         if (!found.contains(adjTile) && !rendered.contains(adjTile)) {
                             found.add(adjTile);
@@ -157,7 +158,9 @@ public class MapManager {
     }
     
     public boolean render(MapTile tile) {
-        return tile.getMap().render(tile, getTileFile(tile));
+        boolean result = tile.getMap().render(tile, getTileFile(tile));
+        pushUpdate(tile.getWorld(), new Client.Tile(tile.getFilename()));
+        return result;
     }
     
     
@@ -172,4 +175,31 @@ public class MapManager {
         }
         return new File(worldTileDirectory, tile.getFilename()); 
     }
+
+    public void pushUpdate(Object update) {
+        for(int i=0;i<worlds.size();i++) {
+            UpdateQueue queue = worldUpdateQueues.get(worlds.get(i));
+            queue.pushUpdate(update);
+        }
+    }
+    
+    public void pushUpdate(World world, Object update) {
+        pushUpdate(world.getName(), update);
+    }
+    
+    public void pushUpdate(String world, Object update) {
+        UpdateQueue updateQueue = worldUpdateQueues.get(world);
+        if (updateQueue == null) {
+            worldUpdateQueues.put(world, updateQueue = new UpdateQueue());
+            worlds.add(world);
+        }
+        updateQueue.pushUpdate(update);
+    }
+    
+    public Object[] getWorldUpdates(String worldName, long since) {
+        UpdateQueue queue = worldUpdateQueues.get(worldName);
+        if (queue == null)
+            return new Object[0];
+        return queue.getUpdatedObjects(since);
+    }
 }

src/main/java/org/dynmap/PlayerList.java

@@ -11,6 +11,7 @@ import java.util.HashSet;
 import java.util.Scanner;
 
 import org.bukkit.Server;
+import org.bukkit.World;
 import org.bukkit.entity.Player;
 
 public class PlayerList {
@@ -68,6 +69,21 @@ public class PlayerList {
             hide(playerName);
     }
 
+    // TODO: Clean this up... one day
+    public Player[] getVisiblePlayers(String worldName) {
+        ArrayList<Player> visiblePlayers = new ArrayList<Player>();
+        Player[] onlinePlayers = server.getOnlinePlayers();
+        for (int i = 0; i < onlinePlayers.length; i++) {
+            Player p = onlinePlayers[i];
+            if (p.getWorld().getName().equals(worldName) && !hiddenPlayerNames.contains(p.getName())) {
+                visiblePlayers.add(p);
+            }
+        }
+        Player[] result = new Player[visiblePlayers.size()];
+        visiblePlayers.toArray(result);
+        return result;
+    }
+    
     public Player[] getVisiblePlayers() {
         ArrayList<Player> visiblePlayers = new ArrayList<Player>();
         Player[] onlinePlayers = server.getOnlinePlayers();

src/main/java/org/dynmap/UpdateQueue.java

@@ -11,7 +11,7 @@ public class UpdateQueue {
 
     private static final int maxUpdateAge = 120000;
 
-    public void pushUpdate(Object obj) {
+    public synchronized void pushUpdate(Object obj) {
         long now = System.currentTimeMillis();
         long deadline = now - maxUpdateAge;
         synchronized (lock) {
@@ -27,7 +27,7 @@ public class UpdateQueue {
 
     private ArrayList<Object> tmpupdates = new ArrayList<Object>();
 
-    public Object[] getUpdatedObjects(long since) {
+    public synchronized Object[] getUpdatedObjects(long since) {
         long now = System.currentTimeMillis();
         long deadline = now - maxUpdateAge;
         Object[] updates;

src/main/java/org/dynmap/kzedmap/KzedMap.java

@@ -15,11 +15,9 @@ import java.util.logging.Logger;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.dynmap.DynmapChunk;
-import org.dynmap.MapManager;
 import org.dynmap.MapTile;
 import org.dynmap.MapType;
 import org.dynmap.debug.Debug;
-import org.dynmap.debug.Debugger;
 
 public class KzedMap extends MapType {
     protected static final Logger log = Logger.getLogger("Minecraft");

src/main/java/org/dynmap/web/handlers/ClientUpdateHandler.java

@@ -2,6 +2,9 @@ package org.dynmap.web.handlers;
 
 import java.io.BufferedOutputStream;
 import java.util.Date;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
 
 import org.bukkit.World;
 import org.bukkit.entity.Player;
@@ -24,14 +27,24 @@ public class ClientUpdateHandler implements HttpHandler {
         this.world = world;
     }
 
+    Pattern updatePathPattern = Pattern.compile("world/([a-zA-Z0-9_]+)/([0-9]*)");
     @Override
     public void handle(String path, HttpRequest request, HttpResponse response) throws Exception {
+        
+        Matcher match = updatePathPattern.matcher(path);
+        
+        if (!match.matches())
+            return;
+        
+        String worldName = match.group(1);
+        String timeKey = match.group(2);
+        
         long current = System.currentTimeMillis();
-        long cutoff = 0;
+        long since = 0;
 
         if (path.length() > 0) {
             try {
-                cutoff = Long.parseLong(path);
+                since = Long.parseLong(timeKey);
             } catch (NumberFormatException e) {
             }
         }
@@ -41,14 +54,15 @@ public class ClientUpdateHandler implements HttpHandler {
         update.servertime = world.getTime() % 24000;
         
         
-        Player[] players = playerList.getVisiblePlayers();
+        Player[] players = playerList.getVisiblePlayers(worldName);
         update.players = new Client.Player[players.length];
         for(int i=0;i<players.length;i++) {
             Player p = players[i];
             update.players[i] = new Client.Player(p.getName(), p.getLocation().getX(), p.getLocation().getY(), p.getLocation().getZ());
         }
         
-        update.updates = mapManager.updateQueue.getUpdatedObjects(cutoff);
+        update.updates = mapManager.getWorldUpdates(worldName, since);
+        
         
         byte[] bytes = Json.stringifyJson(update).getBytes();