From 40ceb3d0b86dc2c96dafeff2818a618c0f78020f Mon Sep 17 00:00:00 2001 From: sk89q Date: Mon, 25 Aug 2014 14:18:26 -0700 Subject: [PATCH] Fix NPE when handling PlayerFishEvent. Fixes WORLDGUARD-3149. --- .../worldguard/bukkit/listener/EventAbstractionListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java b/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java index a799905b..a471a53b 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java @@ -544,7 +544,7 @@ public void onBlockExp(BlockExpEvent event) { @EventHandler(ignoreCancelled = true) public void onPlayerFish(PlayerFishEvent event) { - if (Events.fireAndTestCancel(new SpawnEntityEvent(event, create(event.getPlayer(), event.getHook()), event.getCaught().getLocation(), EntityType.EXPERIENCE_ORB))) { + if (Events.fireAndTestCancel(new SpawnEntityEvent(event, create(event.getPlayer(), event.getHook()), event.getHook().getLocation(), EntityType.EXPERIENCE_ORB))) { event.setExpToDrop(0); } }