Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
a0b8b886c8
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
CraftBukkit Changes:
d5a72960 SPIGOT-6063: ConsoleSender sending extra lines in Java 13+
Spigot Changes:
2740d5ae Rebuild patches
20 Zeilen
967 B
Diff
20 Zeilen
967 B
Diff
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
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
|
|
index a6fa45eedc26ddf78a67281c29f6b6b05a85707c..a6f67e473cfe2c9eb3d4466f9bc23b9d0212126b 100644
|
|
--- a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
|
|
+++ b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
|
|
@@ -55,7 +55,7 @@ public class PathfinderGoalTempt extends PathfinderGoal {
|
|
}
|
|
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
|
|
}
|
|
}
|