diff --git a/Factions.jar b/Factions-1.8.2.jar similarity index 58% rename from Factions.jar rename to Factions-1.8.2.jar index c1a3216..6e91079 100644 Binary files a/Factions.jar and b/Factions-1.8.2.jar differ diff --git a/pom.xml b/pom.xml index 9db08bc..033fe3a 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 - - - - @@ -83,7 +59,7 @@ org.dynmap dynmap-api - 1.0 + 1.7 org.bukkit @@ -93,9 +69,9 @@ com.massivecraft Factions - 1.8.0 + 1.8.2 system - ${project.basedir}/Factions.jar + ${project.basedir}/Factions-1.8.2.jar diff --git a/src/main/java/org/dynmap/factions/DynmapFactionsPlugin.java b/src/main/java/org/dynmap/factions/DynmapFactionsPlugin.java index 5943dd5..d214030 100644 --- a/src/main/java/org/dynmap/factions/DynmapFactionsPlugin.java +++ b/src/main/java/org/dynmap/factions/DynmapFactionsPlugin.java @@ -83,6 +83,7 @@ public class DynmapFactionsPlugin extends JavaPlugin { double fillopacity; String homemarker; MarkerIcon homeicon; + boolean boost; AreaStyle(FileConfiguration cfg, String path, AreaStyle def) { strokecolor = cfg.getString(path+".strokeColor", def.strokecolor); @@ -98,6 +99,7 @@ public class DynmapFactionsPlugin extends JavaPlugin { homeicon = markerapi.getMarkerIcon("blueicon"); } } + boost = cfg.getBoolean(path+".boost", def.boost); } AreaStyle(FileConfiguration cfg, String path) { @@ -114,6 +116,7 @@ public class DynmapFactionsPlugin extends JavaPlugin { homeicon = markerapi.getMarkerIcon("blueicon"); } } + boost = cfg.getBoolean(path+".boost", false); } } @@ -259,6 +262,7 @@ public class DynmapFactionsPlugin extends JavaPlugin { } m.setLineStyle(as.strokeweight, as.strokeopacity, sc); m.setFillStyle(as.fillopacity, fc); + m.setBoostFlag(as.boost); } private MarkerIcon getMarkerIcon(String factname, Faction fact) { diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 9b9618f..f06e41b 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -26,6 +26,7 @@ regionstyle: fillColor: "#FF0000" fillOpacity: 0.35 homeicon: "redflag" + 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,9 @@ custstyle: SafeZone: strokeColor: "#0000FF" fillColor: "#0000FF" + boost: false WarZone: strokeColor: "#404040" fillColor: "#404040" + boost: false + \ No newline at end of file