aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0884-Fix-Bee-flower-NPE.patch
blob: d1fca0922fd72b4adeef8d1690a2692d0cac351b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
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) {