2018-08-27 02:11:49 +08:00
|
|
|
From cb4108bd19b1858eba6660560f057a2ef32ae100 Mon Sep 17 00:00:00 2001
|
2018-07-18 08:37:30 +08:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Wed, 29 Nov 2017 22:18:54 -0500
|
|
|
|
Subject: [PATCH] Avoid NPE in PathfinderGoalTempt
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
|
2018-07-23 16:39:55 +08:00
|
|
|
index 8ca996e652..1b82479418 100644
|
2018-07-18 08:37:30 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
|
2018-07-18 12:52:33 +08:00
|
|
|
@@ -52,7 +52,7 @@ public class PathfinderGoalTempt extends PathfinderGoal {
|
2018-07-18 08:37:30 +08:00
|
|
|
}
|
|
|
|
this.target = (event.getTarget() == null) ? null : ((CraftLivingEntity) event.getTarget()).getHandle();
|
|
|
|
}
|
|
|
|
- return tempt;
|
|
|
|
+ return tempt && this.target != null; // Paper - must have target - plugin might of cancelled
|
|
|
|
// CraftBukkit end
|
|
|
|
}
|
|
|
|
}
|
|
|
|
--
|
|
|
|
2.18.0
|
|
|
|
|