Fix Bee setFlower NPE (#8107)

PaperMC · Jul 6, 2022 · 6ea73e7 · 6ea73e7
1 parent a05e69b
commit 6ea73e7
Showing 1 changed file with 19 additions and 0 deletions.
diff --git a/patches/server/0924-Fix-Bee-flower-NPE.patch b/patches/server/0924-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 bd048cc30046f19f9eee89c6ba45d0816a160e67..e5de2c1d11e5de88420caba35bf75c8bbd799db5 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
++++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
+@@ -802,7 +802,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) {