diff --git a/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java b/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java index 16101966c..d2c1fdf58 100644 --- a/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java +++ b/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java @@ -145,8 +145,10 @@ public class BukkitUtil extends BlockManager { } public static World getWorld(final String string) { - if (StringMan.isEqual(string,lastString)) { - return lastWorld; + if (StringMan.isEqual(string, lastString)) { + if (lastWorld != null) { + return lastWorld; + } } World world = Bukkit.getWorld(string); lastString = string; diff --git a/target/PlotSquared-Bukkit.jar b/target/PlotSquared-Bukkit.jar index a31b7e45e..664174a80 100644 Binary files a/target/PlotSquared-Bukkit.jar and b/target/PlotSquared-Bukkit.jar differ diff --git a/target/PlotSquared-Sponge.jar b/target/PlotSquared-Sponge.jar index 7cfd18f9c..1840d521c 100644 Binary files a/target/PlotSquared-Sponge.jar and b/target/PlotSquared-Sponge.jar differ