diff --git a/pom.xml b/pom.xml index 09e2933..bed2860 100644 --- a/pom.xml +++ b/pom.xml @@ -34,30 +34,6 @@ 1.6 - - maven-assembly-plugin - - - src/main/assembly/package.xml - - - - 420 - 493 - 493 - - - - - - build - package - - single - - - - @@ -84,26 +60,26 @@ org.dynmap dynmap-api - 1.3 + 1.7 org.bukkit bukkit - 1.4.5-R1.0 + 1.5.2-R0.1 com.sk89q WorldGuard - 5.7 + 5.7.3 system - ${project.basedir}/worldguard-5.7.jar + ${project.basedir}/worldguard-5.7.3.jar com.sk89q WorldEdit - 5.5 + 5.5.6 system - ${project.basedir}/worldedit-5.5.jar + ${project.basedir}/worldedit-5.5.6.jar \ No newline at end of file diff --git a/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java b/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java index 0a83e12..02fec70 100644 --- a/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java +++ b/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java @@ -68,6 +68,7 @@ public class DynmapWorldGuardPlugin extends JavaPlugin { String fillcolor; double fillopacity; String label; + boolean boost; AreaStyle(FileConfiguration cfg, String path, AreaStyle def) { strokecolor = cfg.getString(path+".strokeColor", def.strokecolor); @@ -77,6 +78,7 @@ public class DynmapWorldGuardPlugin extends JavaPlugin { fillcolor = cfg.getString(path+".fillColor", def.fillcolor); fillopacity = cfg.getDouble(path+".fillOpacity", def.fillopacity); label = cfg.getString(path+".label", null); + boost = cfg.getBoolean(path+".boost", def.boost); } AreaStyle(FileConfiguration cfg, String path) { @@ -86,6 +88,7 @@ public class DynmapWorldGuardPlugin extends JavaPlugin { strokeweight = cfg.getInt(path+".strokeWeight", 3); fillcolor = cfg.getString(path+".fillColor", "#FF0000"); fillopacity = cfg.getDouble(path+".fillOpacity", 0.35); + boost = cfg.getBoolean(path+".boost", false); } } @@ -197,6 +200,7 @@ public class DynmapWorldGuardPlugin extends JavaPlugin { if(as.label != null) { m.setLabel(as.label); } + m.setBoostFlag(as.boost); } /* Handle specific region */ diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 34ce4f2..2aba386 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -26,6 +26,7 @@ regionstyle: fillColor: "#FF0000" fillOpacity: 0.35 unownedStrokeColor: "#00FF00" + boost: false # Optional setting to limit which regions to show, by name - if commented out, all regions are shown # To show all regions on a given world, add 'world:' to the list @@ -40,6 +41,7 @@ hiddenregions: [ ] custstyle: customregion1: strokeColor: "#00FF00" + boost: true # Optional per-owner overrides for regionstyle (lower priority than custstyle) - works for group or user names ownerstyle: diff --git a/worldedit-5.5.jar b/worldedit-5.5.6.jar similarity index 54% rename from worldedit-5.5.jar rename to worldedit-5.5.6.jar index 5ae71a9..2f7b50d 100644 Binary files a/worldedit-5.5.jar and b/worldedit-5.5.6.jar differ diff --git a/worldguard-5.7.jar b/worldguard-5.7.3.jar similarity index 61% rename from worldguard-5.7.jar rename to worldguard-5.7.3.jar index a537fde..ac694df 100644 Binary files a/worldguard-5.7.jar and b/worldguard-5.7.3.jar differ