mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 07:20:24 +01:00
43 lines
2.3 KiB
Diff
43 lines
2.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: chickeneer <emcchickeneer@gmail.com>
|
||
|
|
Date: Tue, 17 Mar 2020 14:18:50 -0500
|
||
|
|
Subject: [PATCH] Do not allow bees to load chunks for beehives
|
||
|
|
|
||
|
|
|
||
|
|
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 9b68809b91910d2bbb82cafe23d1de5dfff4221c..81291a1174538d6d4073c6fa886b10e99b45d887 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
|
||
|
|
@@ -358,6 +358,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
|
||
|
|
if (this.hivePos == null) {
|
||
|
|
return false;
|
||
|
|
} else {
|
||
|
|
+ if (!this.level.isLoadedAndInBounds(hivePos)) return false; // Paper
|
||
|
|
BlockEntity tileentity = this.level.getBlockEntity(this.hivePos);
|
||
|
|
|
||
|
|
return tileentity instanceof BeehiveBlockEntity && ((BeehiveBlockEntity) tileentity).isFireNearby();
|
||
|
|
@@ -390,6 +391,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
|
||
|
|
}
|
||
|
|
|
||
|
|
private boolean doesHiveHaveSpace(BlockPos pos) {
|
||
|
|
+ if (!this.level.isLoadedAndInBounds(pos)) return false; // Paper
|
||
|
|
BlockEntity tileentity = this.level.getBlockEntity(pos);
|
||
|
|
|
||
|
|
return tileentity instanceof BeehiveBlockEntity ? !((BeehiveBlockEntity) tileentity).isFull() : false;
|
||
|
|
@@ -632,6 +634,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
|
||
|
|
@Override
|
||
|
|
public boolean canBeeUse() {
|
||
|
|
if (Bee.this.hasHive() && Bee.this.wantsToEnterHive() && Bee.this.hivePos.closerThan((Position) Bee.this.position(), 2.0D)) {
|
||
|
|
+ if (!Bee.this.level.isLoadedAndInBounds(Bee.this.hivePos)) return false; // Paper
|
||
|
|
BlockEntity tileentity = Bee.this.level.getBlockEntity(Bee.this.hivePos);
|
||
|
|
|
||
|
|
if (tileentity instanceof BeehiveBlockEntity) {
|
||
|
|
@@ -655,6 +658,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
|
||
|
|
|
||
|
|
@Override
|
||
|
|
public void start() {
|
||
|
|
+ if (!Bee.this.level.isLoadedAndInBounds(Bee.this.hivePos)) return; // Paper
|
||
|
|
BlockEntity tileentity = Bee.this.level.getBlockEntity(Bee.this.hivePos);
|
||
|
|
|
||
|
|
if (tileentity instanceof BeehiveBlockEntity) {
|