From 881534214118dbca8e2a01519a3975b09aeb594f Mon Sep 17 00:00:00 2001 From: ProgrammerDan Date: Mon, 24 Apr 2017 12:22:14 -0400 Subject: [PATCH] Time to get serious. Upgraded version to 1.0.0 and fixed an unchecked null causing a test to fail. TODO need to add a new test to check that the disallowedworlds feature is working. --- pom.xml | 4 ++-- .../java/com/devotedmc/ExilePearl/core/CorePearlManager.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 41f4097c..eefb7b00 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.devotedmc ExilePearl jar - 0.5.9-SNAPSHOT + 1.0.0-SNAPSHOT ExilePearl https://github.com/DevotedMC/ExilePearl @@ -124,7 +124,7 @@ io.lumine.xikage MythicLib - 0.0.1-SNAPSHOT + 1.0.1 provided diff --git a/src/main/java/com/devotedmc/ExilePearl/core/CorePearlManager.java b/src/main/java/com/devotedmc/ExilePearl/core/CorePearlManager.java index 5ac8d8e7..3c9acd42 100644 --- a/src/main/java/com/devotedmc/ExilePearl/core/CorePearlManager.java +++ b/src/main/java/com/devotedmc/ExilePearl/core/CorePearlManager.java @@ -268,7 +268,7 @@ public void decayPearls() { } PearlHolder holder = pearl.getHolder(); - if(holder.isBlock() && disallowedWorlds.contains(holder.getLocation().getWorld().getName())) { + if(holder != null && holder.isBlock() && disallowedWorlds.contains(holder.getLocation().getWorld().getName())) { pearlApi.log("Freeing pearl for player %s because the pearl is stored in disallowed world %s.", pearl.getPlayerName(),holder.getLocation().getWorld().getName()); pearlsToFree.add(pearl); }