aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0740-Fix-bees-aging-inside-hives.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0740-Fix-bees-aging-inside-hives.patch')
-rw-r--r--patches/server/0740-Fix-bees-aging-inside-hives.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/patches/server/0740-Fix-bees-aging-inside-hives.patch b/patches/server/0740-Fix-bees-aging-inside-hives.patch
new file mode 100644
index 0000000000..646f563356
--- /dev/null
+++ b/patches/server/0740-Fix-bees-aging-inside-hives.patch
@@ -0,0 +1,49 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Sat, 21 Aug 2021 21:54:16 -0700
+Subject: [PATCH] Fix bees aging inside hives
+
+Fixes bees incorrectly being aged up due to upstream's
+resetting the ticks inside hive on a failed release
+
+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 9d4152f9fde93a832f263c793955d327f1e078f7..cf09525efd2d53bf884cd6ec3b0b9229715895eb 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
+@@ -328,7 +328,7 @@ public class BeehiveBlockEntity extends BlockEntity {
+
+ for (Iterator iterator = bees.iterator(); iterator.hasNext(); ++tileentitybeehive_hivebee.ticksInHive) {
+ tileentitybeehive_hivebee = (BeehiveBlockEntity.BeeData) iterator.next();
+- if (tileentitybeehive_hivebee.ticksInHive > tileentitybeehive_hivebee.minOccupationTicks) {
++ if (tileentitybeehive_hivebee.exitTickCounter > tileentitybeehive_hivebee.minOccupationTicks) { // Paper - use exitTickCounter
+ BeehiveBlockEntity.BeeReleaseStatus tileentitybeehive_releasestatus = tileentitybeehive_hivebee.entityData.getBoolean("HasNectar") ? BeehiveBlockEntity.BeeReleaseStatus.HONEY_DELIVERED : BeehiveBlockEntity.BeeReleaseStatus.BEE_RELEASED;
+
+ if (BeehiveBlockEntity.releaseOccupant(world, pos, state, tileentitybeehive_hivebee, (List) null, tileentitybeehive_releasestatus, flowerPos)) {
+@@ -336,10 +336,11 @@ public class BeehiveBlockEntity extends BlockEntity {
+ iterator.remove();
+ // CraftBukkit start
+ } else {
+- tileentitybeehive_hivebee.ticksInHive = tileentitybeehive_hivebee.minOccupationTicks / 2; // Not strictly Vanilla behaviour in cases where bees cannot spawn but still reasonable
++ tileentitybeehive_hivebee.exitTickCounter = tileentitybeehive_hivebee.minOccupationTicks / 2; // Not strictly Vanilla behaviour in cases where bees cannot spawn but still reasonable // Paper - use exitTickCounter to keep actual bee life
+ // CraftBukkit end
+ }
+ }
++ tileentitybeehive_hivebee.exitTickCounter++; // Paper
+ }
+
+ if (flag) {
+@@ -428,12 +429,14 @@ public class BeehiveBlockEntity extends BlockEntity {
+
+ final CompoundTag entityData;
+ int ticksInHive;
++ int exitTickCounter; // Paper - separate counter for checking if bee should exit to reduce exit attempts
+ final int minOccupationTicks;
+
+ BeeData(CompoundTag entityData, int ticksInHive, int minOccupationTicks) {
+ BeehiveBlockEntity.removeIgnoredBeeTags(entityData);
+ this.entityData = entityData;
+ this.ticksInHive = ticksInHive;
++ this.exitTickCounter = ticksInHive; // Paper
+ this.minOccupationTicks = minOccupationTicks;
+ }
+ }