mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-08 20:02:31 +01:00
20 lines
1.1 KiB
Diff
20 lines
1.1 KiB
Diff
|
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) {
|