aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0743-Fix-Bee-flower-NPE.patch
blob: 13dcee533d0f9229de6d19a370390a197ef55505 (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 d317b8500e8d2c280e52140440cf2b9cb61c3b28..0dfb8109fd8c022b079da00f6a0e3fc85b57bf7a 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
@@ -794,7 +794,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) {