From 337635d1d835704299250917c4c6ba33ff24e92a Mon Sep 17 00:00:00 2001 From: tastybento Date: Thu, 7 Feb 2019 19:39:27 -0800 Subject: [PATCH] Fixes reloading of data in YAML database https://github.com/BentoBoxWorld/addon-limits/issues/6 --- pom.xml | 2 +- .../addon/limits/listeners/BlockLimitsListener.java | 7 ++++++- .../bentobox/addon/limits/objects/IslandBlockCount.java | 3 +++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6560279..bf1a939 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 world.bentobox limits - 0.0.2-SNAPSHOT + 0.0.3-SNAPSHOT addon-limits An add-on for BentoBox that limits blocks and entities on islands. https://github.com/BentoBoxWorld/addon-level diff --git a/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java b/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java index a9497e8..5a9632f 100644 --- a/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java +++ b/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java @@ -71,6 +71,7 @@ public class BlockLimitsListener implements Listener { ConfigurationSection limitConfig = addon.getConfig().getConfigurationSection("blocklimits"); defaultLimitMap = loadLimits(limitConfig); } + // Load specific worlds if (addon.getConfig().isConfigurationSection("worlds")) { @@ -257,7 +258,11 @@ public class BlockLimitsListener implements Listener { } } // Check default limit map - if (defaultLimitMap.containsKey(m) && countMap.get(id).isAtLimit(m, defaultLimitMap.get(m))) { + if (defaultLimitMap.containsKey(m) + && countMap + .get(id) + .isAtLimit(m, + defaultLimitMap.get(m))) { return defaultLimitMap.get(m); } // No limit diff --git a/src/main/java/bentobox/addon/limits/objects/IslandBlockCount.java b/src/main/java/bentobox/addon/limits/objects/IslandBlockCount.java index 7786137..25e6f54 100644 --- a/src/main/java/bentobox/addon/limits/objects/IslandBlockCount.java +++ b/src/main/java/bentobox/addon/limits/objects/IslandBlockCount.java @@ -24,6 +24,9 @@ public class IslandBlockCount implements DataObject { @Expose private Map blockCount = new HashMap<>(); + // Required for YAML database + public IslandBlockCount() {} + public IslandBlockCount(String uniqueId2) { this.uniqueId = uniqueId2; }