From 91d25ec087108bc8fb6d92a4658e421009f71ebc Mon Sep 17 00:00:00 2001 From: arboriginal Date: Thu, 14 Feb 2019 16:27:55 +0100 Subject: [PATCH] Bugfixes - Moved death position active delay from SC to tracker - Fix error on reload which disabled installed trackers --- src/config.yml | 1 - .../SimpleCompass/managers/DataManager.java | 2 +- .../SimpleCompass/plugin/AbstractTracker.java | 12 ++++++++---- src/plugin.yml | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/config.yml b/src/config.yml index 2abd8d1..6c0f136 100644 --- a/src/config.yml +++ b/src/config.yml @@ -193,7 +193,6 @@ delays: update_version_cache: 60 # (minute) Duration of cache of online version found (should stay large or you will reach rate limit from Github) update_compass: 100 # (millisec) Compass datas refresh on player move, put 0 if you have predator's eyes trackers_list: 2000 # (millisec) Active trackers list (by player) cache - death_position: 900 # (seconds) Time the last death location stays active elytra_durability: 5 # (seconds) Elytra durability calculation (if used in bossbar progress). fix_uuid: 50 # (ticks) Time (after login) before to fix UUID which can happens, especialy in offline mode. option_take_effect: 20 # (ticks) Time to wait before a new open takes effect in the currently active player compasses. diff --git a/src/me/arboriginal/SimpleCompass/managers/DataManager.java b/src/me/arboriginal/SimpleCompass/managers/DataManager.java index d42dc8d..37323bf 100644 --- a/src/me/arboriginal/SimpleCompass/managers/DataManager.java +++ b/src/me/arboriginal/SimpleCompass/managers/DataManager.java @@ -189,7 +189,7 @@ public List activeTargetsList(Player player, String type) { String key = activeTargetsKey(player, type); List list = new ArrayList(); - if (users.getList(key) != null) for (String tracker : users.getStringList(key)) list.add(tracker); + if (users.getList(key) != null) for (String target : users.getStringList(key)) list.add(target); return list; } diff --git a/src/me/arboriginal/SimpleCompass/plugin/AbstractTracker.java b/src/me/arboriginal/SimpleCompass/plugin/AbstractTracker.java index 591f6a3..9a22e13 100644 --- a/src/me/arboriginal/SimpleCompass/plugin/AbstractTracker.java +++ b/src/me/arboriginal/SimpleCompass/plugin/AbstractTracker.java @@ -21,6 +21,7 @@ public abstract class AbstractTracker { protected SimpleCompass sc; protected File sf; + protected URL res; public enum TrackingActions { ADD, ACCEPT, ASK, DEL, DENY, HELP, START, STOP, @@ -37,8 +38,9 @@ public enum TargetSelector { // ---------------------------------------------------------------------------------------------- public AbstractTracker(SimpleCompass plugin) { - sc = plugin; - sf = new File(sc.getDataFolder(), "trackers/" + getClass().getSimpleName() + ".yml"); + sc = plugin; + sf = new File(sc.getDataFolder(), "trackers/" + getClass().getSimpleName() + ".yml"); + res = getClass().getResource("/settings.yml"); } // ---------------------------------------------------------------------------------------------- @@ -68,8 +70,10 @@ public String version() { * so DO NOT USE sc.config here, and DO NOT call methods which use this. */ public boolean init() { - URL res = getClass().getResource("/settings.yml"); - if (res == null) return false; + if (res == null) { + sc.getLogger().warning("settings.yml missing in " + sf.getAbsolutePath()); + return false; + } settings = YamlConfiguration.loadConfiguration(sf); settings.options().copyDefaults(true); diff --git a/src/plugin.yml b/src/plugin.yml index ccff872..74e3c21 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,6 +1,6 @@ name: SimpleCompass description: Simple compass to help player who don't have sense of direction. -version: 0.9.5 +version: 0.9.6 author: arboriginal website: https://www.spigotmc.org/resources/simplecompass.63140/