Skip to content

Commit 6ea73e7

Browse files
Fix Bee setFlower NPE (#8107)
1 parent a05e69b commit 6ea73e7

File tree

1 file changed

+19
-0
lines changed

1 file changed

+19
-0
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Jake Potrebic <jake.m.potrebic@gmail.com>
3+
Date: Wed, 6 Jul 2022 14:59:38 -0700
4+
Subject: [PATCH] Fix Bee flower NPE
5+
6+
7+
diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
8+
index bd048cc30046f19f9eee89c6ba45d0816a160e67..e5de2c1d11e5de88420caba35bf75c8bbd799db5 100644
9+
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
10+
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
11+
@@ -802,7 +802,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
12+
++this.pollinatingTicks;
13+
if (this.pollinatingTicks > 600) {
14+
Bee.this.savedFlowerPos = null;
15+
- } else {
16+
+ } else if (Bee.this.savedFlowerPos != null) { // Paper - add null check since API can manipulate this
17+
Vec3 vec3d = Vec3.atBottomCenterOf(Bee.this.savedFlowerPos).add(0.0D, 0.6000000238418579D, 0.0D);
18+
19+
if (vec3d.distanceTo(Bee.this.position()) > 1.0D) {

0 commit comments

Comments
 (0)