summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchickeneer <emcchickeneer@gmail.com>2017-06-03 00:44:10 -0500
committermd_5 <git@md-5.net>2017-06-04 08:43:00 +1000
commitfe3ca95c764848be56e872e3de57c66cb07d7515 (patch)
tree25cabf9011fe13a5cdd1069c336d3c7fef69d62e
parent10daedccdd9988b0d3744988aa73b9a1a9c5b95b (diff)
downloadcraftbukkit-fe3ca95c764848be56e872e3de57c66cb07d7515.tar
craftbukkit-fe3ca95c764848be56e872e3de57c66cb07d7515.tar.gz
craftbukkit-fe3ca95c764848be56e872e3de57c66cb07d7515.tar.lz
craftbukkit-fe3ca95c764848be56e872e3de57c66cb07d7515.tar.xz
craftbukkit-fe3ca95c764848be56e872e3de57c66cb07d7515.zip
Prevent NPE when setting tempt target to null
-rw-r--r--nms-patches/PathfinderGoalTempt.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/nms-patches/PathfinderGoalTempt.patch b/nms-patches/PathfinderGoalTempt.patch
index e0574094..ec9ecd26 100644
--- a/nms-patches/PathfinderGoalTempt.patch
+++ b/nms-patches/PathfinderGoalTempt.patch
@@ -34,7 +34,7 @@
+ if (event.isCancelled()) {
+ return false;
+ }
-+ this.target = ((CraftLivingEntity) event.getTarget()).getHandle();
++ this.target = (event.getTarget() == null) ? null : ((CraftLivingEntity) event.getTarget()).getHandle();
+ }
+ return tempt;
+ // CraftBukkit end