From bae30eb52f192a10ae7253a1da9fd7da967eeb85 Mon Sep 17 00:00:00 2001 From: "joblo.2213" Date: Sat, 7 Apr 2018 18:03:36 +0200 Subject: [PATCH] Make player priority and hide by default for dynmap marker set customizable --- src/main/java/com/wimbli/WorldBorder/Config.java | 14 ++++++++++++++ .../com/wimbli/WorldBorder/DynMapFeatures.java | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/wimbli/WorldBorder/Config.java b/src/main/java/com/wimbli/WorldBorder/Config.java index 457a1e2..79dd5ec 100644 --- a/src/main/java/com/wimbli/WorldBorder/Config.java +++ b/src/main/java/com/wimbli/WorldBorder/Config.java @@ -49,6 +49,8 @@ public class Config private static boolean portalRedirection = true; private static boolean dynmapEnable = true; private static String dynmapMessage; + private static int dynmapPriority; + private static boolean dynmapHideByDefault; private static int remountDelayTicks = 0; private static boolean killPlayer = false; private static boolean denyEnderpearl = false; @@ -407,6 +409,14 @@ public class Config return dynmapMessage; } + public static boolean DynmapHideByDefault() { + return dynmapHideByDefault; + } + + public static int DynmapPriority() { + return dynmapPriority; + } + public static void setPlayerBypass(UUID player, boolean bypass) { if (bypass) @@ -597,6 +607,8 @@ public class Config remountDelayTicks = cfg.getInt("remount-delay-ticks", 0); dynmapEnable = cfg.getBoolean("dynmap-border-enabled", true); dynmapMessage = cfg.getString("dynmap-border-message", "The border of the world."); + dynmapHideByDefault = cfg.getBoolean("dynmap-broder-hideByDefault", false); + dynmapPriority = cfg.getInt("dynmap-border-priority",0); logConfig("Using " + (ShapeName()) + " border, knockback of " + knockBack + " blocks, and timer delay of " + timerTicks + "."); killPlayer = cfg.getBoolean("player-killed-bad-spawn", false); denyEnderpearl = cfg.getBoolean("deny-enderpearl", true); @@ -706,6 +718,8 @@ public class Config cfg.set("remount-delay-ticks", remountDelayTicks); cfg.set("dynmap-border-enabled", dynmapEnable); cfg.set("dynmap-border-message", dynmapMessage); + cfg.set("dynmap-broder-hideByDefault", dynmapHideByDefault); + cfg.set("dynmap-border-priority", dynmapPriority); cfg.set("player-killed-bad-spawn", killPlayer); cfg.set("deny-enderpearl", denyEnderpearl); cfg.set("fill-autosave-frequency", fillAutosaveFrequency); diff --git a/src/main/java/com/wimbli/WorldBorder/DynMapFeatures.java b/src/main/java/com/wimbli/WorldBorder/DynMapFeatures.java index 740ca19..924f51d 100644 --- a/src/main/java/com/wimbli/WorldBorder/DynMapFeatures.java +++ b/src/main/java/com/wimbli/WorldBorder/DynMapFeatures.java @@ -150,7 +150,8 @@ public class DynMapFeatures markSet = markApi.createMarkerSet("worldborder.markerset", "WorldBorder", null, false); else markSet.setMarkerSetLabel("WorldBorder"); - + markSet.setLayerPriority(Config.DynmapPriority()); + markSet.setHideByDefault(Config.DynmapHideByDefault()); Map borders = Config.getBorders(); for(Entry stringBorderDataEntry : borders.entrySet()) {