SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bees aging inside hives (#6466)

Browse Source
This commit is contained in:
Jake Potrebic
2021-12-30 11:44:39 -08:00
parent 3b479df487
commit 34f9abb2bd
2 changed files with 70 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/server/Honor-EntityAgeable.ageLock.patch
View File

@@ -12,7 +12,27 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
}
public void ageUp(int age, boolean overGrow) {
+ if (ageLocked) return; // Paper - GH-1459
+ if (this.ageLocked) return; // Paper - GH-1459
int j = this.getAge();
int k = j;
diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
@@ -0,0 +0,0 @@ public class BeehiveBlockEntity extends BlockEntity {
}
private static void setBeeReleaseData(int ticks, Bee bee) {
+ if (!bee.ageLocked) { // Paper - respect age lock
int j = bee.getAge();
if (j < 0) {
@@ -0,0 +0,0 @@ public class BeehiveBlockEntity extends BlockEntity {
} else if (j > 0) {
bee.setAge(Math.max(0, j - ticks));
}
+ } // Paper - respect age lock
bee.setInLoveTime(Math.max(0, bee.getInLoveTime() - ticks));
}