2021-06-11 12:02:28 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
|
Date: Wed, 29 Nov 2017 22:18:54 -0500
|
|
|
|
|
Subject: [PATCH] Avoid NPE in PathfinderGoalTempt
|
2021-06-12 15:06:20 +00:00
|
|
|
Not needed anymore
|
2021-06-15 02:54:17 +00:00
|
|
|
similar check added by Mojang
|
2021-06-11 12:02:28 +00:00
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/TemptGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/TemptGoal.java
|
|
|
|
|
index 186025458e923d153e9e47c2be147a9bb53db517..11ca6a752bac4ba4bc683bef844d204b739fab63 100644
|
|
|
|
|
--- a/src/main/java/net/minecraft/world/entity/ai/goal/TemptGoal.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/ai/goal/TemptGoal.java
|
|
|
|
|
@@ -63,7 +63,7 @@ public class TemptGoal extends Goal {
|
|
|
|
|
}
|
|
|
|
|
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
|
|
|
|
|
}
|
|
|
|
|
}
|
