From 4ba58e6072b8842e09292e7db121a8a7baa31e3b Mon Sep 17 00:00:00 2001 From: jedk1 Date: Tue, 12 Jan 2016 17:36:30 +0000 Subject: [PATCH 1/2] Fix NPE in EarthSmash --- src/com/projectkorra/projectkorra/earthbending/EarthSmash.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/projectkorra/projectkorra/earthbending/EarthSmash.java b/src/com/projectkorra/projectkorra/earthbending/EarthSmash.java index afa8bf4b..a3088261 100644 --- a/src/com/projectkorra/projectkorra/earthbending/EarthSmash.java +++ b/src/com/projectkorra/projectkorra/earthbending/EarthSmash.java @@ -503,6 +503,9 @@ public class EarthSmash { for (EarthSmash smash : instances) { if (reqState == null || smash.state == reqState) for (Block block : blocks) { + if (block == null || smash.loc == null) { + continue; + } if (block.getLocation().getWorld() == smash.loc.getWorld() && block.getLocation().distanceSquared(smash.loc) <= Math.pow(2.5, 2)) return smash; } From 4c549f6e7888e5e46f348ae01a12ae871ea9233c Mon Sep 17 00:00:00 2001 From: jedk1 Date: Tue, 12 Jan 2016 22:05:28 +0000 Subject: [PATCH 2/2] Fix remove command not firing event --- src/com/projectkorra/projectkorra/command/RemoveCommand.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/projectkorra/projectkorra/command/RemoveCommand.java b/src/com/projectkorra/projectkorra/command/RemoveCommand.java index 3bc2eb39..e5cdd457 100644 --- a/src/com/projectkorra/projectkorra/command/RemoveCommand.java +++ b/src/com/projectkorra/projectkorra/command/RemoveCommand.java @@ -43,6 +43,7 @@ public class RemoveCommand extends PKCommand { return; } sender.sendMessage(GeneralMethods.getElementColor(e) + "You have removed your " + e.toString().toLowerCase() + "bending."); + Bukkit.getServer().getPluginManager().callEvent(new PlayerChangeElementEvent(sender, (Player) sender, e, Result.REMOVE)); return; } else { sender.sendMessage(ChatColor.RED + "You do not have that element!");