From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jake Potrebic 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 19127ec5d89235ea9af549810b24783e0af85a3d..483dc52c793d9f90a35b1d091dd8ce71115e4640 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 @@ -325,7 +325,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)) { @@ -333,10 +333,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) { @@ -425,12 +426,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; } }