geforkt von Mirrors/Paper
43 Zeilen
2.3 KiB
Diff
43 Zeilen
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 644a0e9858b61d0032ea2919fab40c444bc84f85..9c7c59d1230110010033a9c9959b375eac3ebc2b 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
|
|
@@ -413,6 +413,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
|
|
if (this.hivePos == null) {
|
|
return false;
|
|
} else {
|
|
+ if (!this.level().isLoadedAndInBounds(this.hivePos)) return false; // Paper
|
|
BlockEntity tileentity = this.level().getBlockEntity(this.hivePos);
|
|
|
|
return tileentity instanceof BeehiveBlockEntity && ((BeehiveBlockEntity) tileentity).isFireNearby();
|
|
@@ -446,6 +447,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;
|
|
@@ -922,6 +924,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
|
|
@Override
|
|
public boolean canBeeUse() {
|
|
if (Bee.this.hasHive() && Bee.this.wantsToEnterHive() && Bee.this.hivePos.closerToCenterThan(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) {
|
|
@@ -945,6 +948,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) {
|