From 8c6fb4f4ee2fd43bf16b616e5e60353377ff9014 Mon Sep 17 00:00:00 2001 From: tastybento Date: Tue, 20 Aug 2019 07:50:11 -0700 Subject: [PATCH] Fixed permission reference --- pom.xml | 6 +++--- .../java/world/bentobox/warps/WarpSignsListener.java | 2 +- .../java/world/bentobox/warps/WarpSignsManager.java | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 173b09f..9319e4d 100644 --- a/pom.xml +++ b/pom.xml @@ -58,15 +58,15 @@ 2.0.2 - 1.13.2-R0.1-SNAPSHOT - 1.6.0-SNAPSHOT + 1.14.4-R0.1-SNAPSHOT + 1.6.0 1.5.0 ${build.version}-SNAPSHOT -LOCAL - 1.6.0 + 1.6.1 diff --git a/src/main/java/world/bentobox/warps/WarpSignsListener.java b/src/main/java/world/bentobox/warps/WarpSignsListener.java index 80b1bae..b0724c9 100644 --- a/src/main/java/world/bentobox/warps/WarpSignsListener.java +++ b/src/main/java/world/bentobox/warps/WarpSignsListener.java @@ -97,7 +97,7 @@ public class WarpSignsListener implements Listener { // Welcome sign detected - check permissions if (!(user.hasPermission(addon.getPermPrefix(b.getWorld()) + "island.addwarp"))) { user.sendMessage("warps.error.no-permission"); - user.sendMessage("general.errors.you-need", "[permission]", addon.getPermPrefix(b.getWorld()) + "island.addwarp"); + user.sendMessage("general.errors.no-permission", "[permission]", addon.getPermPrefix(b.getWorld()) + "island.addwarp"); return; } // Get level if level addon is available diff --git a/src/main/java/world/bentobox/warps/WarpSignsManager.java b/src/main/java/world/bentobox/warps/WarpSignsManager.java index e657949..a2938a8 100644 --- a/src/main/java/world/bentobox/warps/WarpSignsManager.java +++ b/src/main/java/world/bentobox/warps/WarpSignsManager.java @@ -50,6 +50,7 @@ public class WarpSignsManager { private Database handler; private Warp addon; + private WarpsData warpsData = new WarpsData(); /** * Get the warp map for this world @@ -164,12 +165,11 @@ public class WarpSignsManager { private void loadWarpList() { addon.getLogger().info("Loading warps..."); worldsWarpList = new HashMap<>(); - WarpsData warps = new WarpsData(); if (handler.objectExists("warps")) { - warps = handler.loadObject("warps"); + warpsData = handler.loadObject("warps"); // Load into map - if (warps != null) { - warps.getWarpSigns().forEach((k,v) -> { + if (warpsData != null) { + warpsData.getWarpSigns().forEach((k,v) -> { if (k != null && k.getWorld() != null && k.getBlock().getType().name().contains("SIGN")) { // Add to map getWarpMap(k.getWorld()).put(v, k); @@ -240,7 +240,7 @@ public class WarpSignsManager { * Saves the warp lists to the database */ public void saveWarpList() { - handler.saveObject(new WarpsData().save(worldsWarpList)); + handler.saveObject(warpsData .save(worldsWarpList)); } /**