aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0830-Fix-Bee-flower-NPE.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0830-Fix-Bee-flower-NPE.patch')
-rw-r--r--patches/server/0830-Fix-Bee-flower-NPE.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/server/0830-Fix-Bee-flower-NPE.patch b/patches/server/0830-Fix-Bee-flower-NPE.patch
new file mode 100644
index 0000000000..bbc40a996b
--- /dev/null
+++ b/patches/server/0830-Fix-Bee-flower-NPE.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Wed, 6 Jul 2022 14:59:38 -0700
+Subject: [PATCH] Fix Bee flower NPE
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
+index 63678ff2e40d2ba0a5e97539394b18f97368f8cf..9a7956befc346e1b58f064213800fd099a052fc6 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
++++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
+@@ -803,7 +803,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+ ++this.pollinatingTicks;
+ if (this.pollinatingTicks > 600) {
+ Bee.this.savedFlowerPos = null;
+- } else {
++ } else if (Bee.this.savedFlowerPos != null) { // Paper - add null check since API can manipulate this
+ Vec3 vec3d = Vec3.atBottomCenterOf(Bee.this.savedFlowerPos).add(0.0D, 0.6000000238418579D, 0.0D);
+
+ if (vec3d.distanceTo(Bee.this.position()) > 1.0D) {