geforkt von Mirrors/Paper
ef0e5a642d
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 9ae3f10f SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API 48c0c547 PR-786: Add methods to get sounds from entities CraftBukkit Changes: 5cc9c022a SPIGOT-7152: Handle hand item changing during air interact event 4ffa1acf6 SPIGOT-7154: Players get kicked when interacting with a conversation 4daa21123 SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API e5d6a9bbf PR-1100: Add methods to get sounds from entities b7e9f1c8b SPIGOT-7146: Reduce use of Material switch in ItemMeta Spigot Changes: 4c157bb4 Rebuild patches
50 Zeilen
3.1 KiB
Diff
50 Zeilen
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 82ad97800cb115cc4830337a59cc4608c1d4a7a0..41c9f074203915c31c1ae7a160ce509c13383f84 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;
|
|
}
|
|
}
|