From d5c942363ec12c5f046ba2a0de1d9459790b67f4 Mon Sep 17 00:00:00 2001 From: montlikadani Date: Sun, 8 Mar 2020 14:12:29 +0100 Subject: [PATCH] Fix issue when the world is not exists and throws errors --- .../com/gamingmesh/jobs/stuff/FurnaceBrewingHandling.java | 7 ++++--- src/main/java/com/gamingmesh/jobs/stuff/blockLoc.java | 7 ++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gamingmesh/jobs/stuff/FurnaceBrewingHandling.java b/src/main/java/com/gamingmesh/jobs/stuff/FurnaceBrewingHandling.java index 27473b94..e59d814e 100644 --- a/src/main/java/com/gamingmesh/jobs/stuff/FurnaceBrewingHandling.java +++ b/src/main/java/com/gamingmesh/jobs/stuff/FurnaceBrewingHandling.java @@ -350,15 +350,16 @@ public class FurnaceBrewingHandling { List ls = brewingMap.remove(uuid); if (ls == null) return 0; + for (blockLoc one : ls) { Block block = one.getBlock(); if (block == null) continue; - if (!CMIMaterial.get(block).equals(CMIMaterial.BREWING_STAND)) - continue; - block.removeMetadata(JobsPaymentListener.brewingOwnerMetadata, Jobs.getInstance()); + if (CMIMaterial.get(block).equals(CMIMaterial.BREWING_STAND)) + block.removeMetadata(JobsPaymentListener.brewingOwnerMetadata, Jobs.getInstance()); } + return ls.size(); } diff --git a/src/main/java/com/gamingmesh/jobs/stuff/blockLoc.java b/src/main/java/com/gamingmesh/jobs/stuff/blockLoc.java index bbd39526..b1a011d1 100644 --- a/src/main/java/com/gamingmesh/jobs/stuff/blockLoc.java +++ b/src/main/java/com/gamingmesh/jobs/stuff/blockLoc.java @@ -84,10 +84,15 @@ public class blockLoc { World w = this.w == null ? Bukkit.getWorld(worldName) : this.w; if (w == null) return null; + + w = Bukkit.getWorld(w.getName()); + if (w == null) { + return null; + } + this.w = w; Location loc = new Location(w, x, y, z); - return loc; } }