mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-30 23:39:58 +01:00
4104545b11
"It was from a different time before books were as jank as they are now. As time has gone on they've only proven to be worse and worse."
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 8e2ebb2ba724d94c5723d82affc01ccb264c95c5..2639f64f1a50faddc0284fb26b73b563b3e9eba9 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
|
|
@@ -409,6 +409,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();
|
|
@@ -441,6 +442,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;
|
|
@@ -914,6 +916,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) {
|
|
@@ -937,6 +940,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) {
|