mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-31 07:49:57 +01:00
50 lines
3.1 KiB
Diff
50 lines
3.1 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||
|
|
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 e5e65bb68a92fffbf765eb140fe1e1ec77059c49..b05ac56823feaf062b1418c9e6dbe4268225f00f 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
|
||
|
|
@@ -324,7 +324,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)) {
|
||
|
|
@@ -332,10 +332,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) {
|
||
|
|
@@ -424,12 +425,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;
|
||
|
|
}
|
||
|
|
}
|