Merge remote branch 'upstream/jetty'

2012-01-11 20:45:31 -06:00 · 2012-01-11 20:45:31 -06:00 · 9c49054c89
commit 9c49054c89
parent 4a042e9fd1 d3cd322d5f
20 changed files with 1182 additions and 1118 deletions
--- a/src/main/java/org/dynmap/DynmapWorld.java
+++ b/src/main/java/org/dynmap/DynmapWorld.java
@ -526,4 +526,7 @@ public class DynmapWorld {
    public World getWorld() {
        return world;
    }
+    public boolean isLoaded() {
+        return (world != null);
+    }
 }