Paper/patches/server/0358-Do-not-allow-bees-to-load-chunks-for-beehives.patch

43 lines
2.3 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
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
2023-12-05 23:55:31 +01:00
index d9297c0b2934084a065af7d7c93af8d44c3de8e1..c6235be64d6fb234734dd816052695ac44aea3ae 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
2023-12-05 23:55:31 +01:00
@@ -420,6 +420,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
2021-06-11 14:02:28 +02:00
if (this.hivePos == null) {
return false;
} else {
2023-06-08 00:41:25 +02:00
+ if (!this.level().isLoadedAndInBounds(this.hivePos)) return false; // Paper
BlockEntity tileentity = this.level().getBlockEntity(this.hivePos);
2021-06-11 14:02:28 +02:00
return tileentity instanceof BeehiveBlockEntity && ((BeehiveBlockEntity) tileentity).isFireNearby();
2023-12-05 23:55:31 +01:00
@@ -453,6 +454,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
2021-06-11 14:02:28 +02:00
}
private boolean doesHiveHaveSpace(BlockPos pos) {
2023-06-08 00:41:25 +02:00
+ if (!this.level().isLoadedAndInBounds(pos)) return false; // Paper
BlockEntity tileentity = this.level().getBlockEntity(pos);
2021-06-11 14:02:28 +02:00
return tileentity instanceof BeehiveBlockEntity ? !((BeehiveBlockEntity) tileentity).isFull() : false;
2023-12-05 23:55:31 +01:00
@@ -929,6 +931,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
2021-06-11 14:02:28 +02:00
@Override
public boolean canBeeUse() {
2022-03-01 06:43:03 +01:00
if (Bee.this.hasHive() && Bee.this.wantsToEnterHive() && Bee.this.hivePos.closerToCenterThan(Bee.this.position(), 2.0D)) {
2023-06-08 00:41:25 +02:00
+ if (!Bee.this.level().isLoadedAndInBounds(Bee.this.hivePos)) return false; // Paper
BlockEntity tileentity = Bee.this.level().getBlockEntity(Bee.this.hivePos);
2021-06-11 14:02:28 +02:00
if (tileentity instanceof BeehiveBlockEntity) {
2023-12-05 23:55:31 +01:00
@@ -952,6 +955,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
2021-06-11 14:02:28 +02:00
@Override
public void start() {
2023-06-08 00:41:25 +02:00
+ if (!Bee.this.level().isLoadedAndInBounds(Bee.this.hivePos)) return; // Paper
BlockEntity tileentity = Bee.this.level().getBlockEntity(Bee.this.hivePos);
2021-06-11 14:02:28 +02:00
if (tileentity instanceof BeehiveBlockEntity) {