Update POM to use Bukkit 1.2.5-R1.0

pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.dynmap</groupId>
 	<artifactId>dynmap</artifactId>
-	<version>0.36.2</version>
+	<version>0.37</version>
 	<name>dynmap</name>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -133,7 +133,7 @@
 		<dependency>
 			<groupId>org.bukkit</groupId>
 			<artifactId>bukkit</artifactId>
-			<version>[1.1-R5-SNAPSHOT,1.7)</version>
+			<version>[1.2.5-R1.0,1.7)</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>

src/main/java/org/dynmap/bukkit/BukkitWorld.java

@@ -6,6 +6,8 @@ import java.util.List;
 
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionDefault;
 import org.dynmap.DynmapChunk;
 import org.dynmap.DynmapLocation;
 import org.dynmap.DynmapWorld;
@@ -13,11 +15,12 @@ import org.dynmap.utils.MapChunkCache;
 
 public class BukkitWorld extends DynmapWorld {
     private World world;
+    private Permission perm;
     
     public BukkitWorld(World w) {
         super(w.getName(), w.getMaxHeight(), w.getSeaLevel());
-        
         world = w;
+        perm = new Permission("dynmap.world." + getName(), "Dynmap access for world " + getName(), PermissionDefault.OP);
     }
     /* Test if world is nether */
     @Override

src/main/java/org/dynmap/bukkit/DynmapPlugin.java

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

src/main/java/org/dynmap/bukkit/NewMapChunkCache.java

@@ -1060,6 +1060,9 @@ public class NewMapChunkCache implements MapChunkCache {
         Biome[] b = Biome.values();
         BiomeMap[] bm = BiomeMap.values();
         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++) {
             String bs = b[i].toString();
             for(int j = 0; j < bm.length; j++) {

src/main/java/org/dynmap/bukkit/permissions/NijikokunPermissions.java

@@ -25,6 +25,9 @@ public class NijikokunPermissions implements PermissionProvider {
             return null;
         
         server.getPluginManager().enablePlugin(permissionsPlugin);
+        if(permissionsPlugin.isEnabled() == false)
+            return null;
+        
         Log.info("Using Permissions " + permissionsPlugin.getDescription().getVersion() + " for access control");
         return new NijikokunPermissions(permissionsPlugin, name);
     }

src/main/java/org/dynmap/bukkit/permissions/PEXPermissions.java

@@ -22,6 +22,8 @@ public class PEXPermissions implements PermissionProvider {
         if (permissionsPlugin == null)
             return null;
         server.getPluginManager().enablePlugin(permissionsPlugin);
+        if(permissionsPlugin.isEnabled() == false)
+            return null;
         if(PermissionsEx.isAvailable() == false)
             return null;
         Log.info("Using PermissionsEx " + permissionsPlugin.getDescription().getVersion() + " for access control");

src/main/java/org/dynmap/bukkit/permissions/PermBukkitPermissions.java

@@ -28,6 +28,9 @@ public class PermBukkitPermissions extends BukkitPermissions {
             return null;
         
         server.getPluginManager().enablePlugin(permissionsPlugin);
+        if(permissionsPlugin.isEnabled() == false)
+            return null;
+        
         Log.info("Using PermissionsBukkit " + permissionsPlugin.getDescription().getVersion() + " for access control");
         Log.info("Web interface permissions only available for online users");
         return new PermBukkitPermissions(permissionsPlugin, name, pd);

src/main/java/org/dynmap/bukkit/permissions/bPermPermissions.java

@@ -28,6 +28,9 @@ public class bPermPermissions extends BukkitPermissions {
         if (permissionsPlugin == null)
             return null;
         server.getPluginManager().enablePlugin(permissionsPlugin);
+        if(permissionsPlugin.isEnabled() == false)
+            return null;
+        
         Log.info("Using bPermissions " + permissionsPlugin.getDescription().getVersion() + " for access control");
         return new bPermPermissions(name, pd);
     }

src/main/resources/configuration.txt

@@ -32,12 +32,16 @@ components:
     webchat-requires-login: false
     # If set to true, users must have dynmap.webchat permission in order to chat
     webchat-permissions: false
+    # Limit length of single chat messages
+    chatlengthlimit: 256
   #  # Optional - make players hidden when they are inside/underground/in shadows (#=light level: 0=full shadow,15=sky)
   #  hideifshadow: 4
   #  # Optional - make player hidden when they are under cover (#=sky light level,0=underground,15=open to sky)
   #  hideifundercover: 14
   #  # (Optional) if true, players that are crouching/sneaking will be hidden 
-  #  hideifsneaking: false
+    hideifsneaking: false
+    # If true, player positions/status is protected (login with ID with dynmap.playermarkers.seeall permission required for info other than self)
+    protected-player-info: false
   #- class: org.dynmap.JsonFileClientUpdateComponent
   #  writeinterval: 1
   #  sendhealth: true
@@ -56,6 +60,8 @@ components:
   #  webchat-requires-login: false
   #  # If set to true, users must have dynmap.webchat permission in order to chat
   #  webchat-permissions: false
+  #  # Limit length of single chat messages
+  #  chatlengthlimit: 256
    
   - class: org.dynmap.SimpleWebChatComponent
     allowchat: true
@@ -230,6 +236,9 @@ compass-mode: newnorth
 # Enabled ComputerCraft block rendering support
 #computercraft-support: true
 
+# Enabled LC Trees++ block rendering support
+#lctrees-support: true
+
 render-triggers:
   #- playermove
   #- playerjoin
@@ -243,8 +252,8 @@ render-triggers:
   - blockspread
   - pistonmoved
   - explosion
-  - blockfromto
-  - blockphysics
+  #- blockfromto
+  #- blockphysics
   - structuregrow
   - blockgrow
 

src/main/resources/plugin.yml

@@ -155,6 +155,7 @@ permissions:
       dynmap.dmap.perspectivelist: true
       dynmap.dmap.shaderlist: true
       dynmap.dmap.lightinglist: true
+      dynmap.playermarkers.seeall: true
   dynmap.render:
     description: Allows /dynmap render command
     default: true
@@ -320,3 +321,6 @@ permissions:
   dynmap.webchat:
     description: Allows web chat (if login required for webchat)
     default: true
+  dynmap.playermarkers.seeall:
+    description: Allow all players to be seen by user on web UI
+    default: op