From b4334a61031038053adca2069a1ee2ff6458fe66 Mon Sep 17 00:00:00 2001 From: Etil <81570777+etil2jz@users.noreply.github.com> Date: Fri, 31 Dec 2021 02:25:54 +0100 Subject: [PATCH] Drop "PaperPR Fix bees aging inside hives" Fixed in upstream --- ...ent-updates-if-only-durability-chan.patch} | 0 ...-PaperPR-Fix-bees-aging-inside-hives.patch | 72 ------------------- ...ackets-if-player-has-Fire-Resistanc.patch} | 0 ...70-Packet-obfuscation-and-reduction.patch} | 0 ...atch => 0071-Smooth-World-Teleports.patch} | 0 ...g.patch => 0072-World-Instance-Flag.patch} | 0 ...tch => 0073-lithium-cached-hashcode.patch} | 0 ...spawning-outside-hard-despawn-range.patch} | 0 ...-in-CraftPersistentDataTypeRegistry.patch} | 0 ...076-Remove-Eigencraft-redstone-algo.patch} | 0 ...atch => 0077-Port-alternate-current.patch} | 0 ...078-lithium-chunk-structure-storage.patch} | 0 ...h => 0079-lithium-ai-task-goat-jump.patch} | 0 ...store-gamerules-in-fastutil-hashmap.patch} | 0 ...ath.patch => 0081-lithium-fast-math.patch} | 0 ...g-steps-in-voronoi-using-prediction.patch} | 0 ...-Configurable-enchanting-table-tick.patch} | 0 17 files changed, 72 deletions(-) rename patches/server/{0069-Don-t-send-equipment-updates-if-only-durability-chan.patch => 0068-Don-t-send-equipment-updates-if-only-durability-chan.patch} (100%) delete mode 100644 patches/server/0068-PaperPR-Fix-bees-aging-inside-hives.patch rename patches/server/{0070-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch => 0069-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch} (100%) rename patches/server/{0071-Packet-obfuscation-and-reduction.patch => 0070-Packet-obfuscation-and-reduction.patch} (100%) rename patches/server/{0072-Smooth-World-Teleports.patch => 0071-Smooth-World-Teleports.patch} (100%) rename patches/server/{0073-World-Instance-Flag.patch => 0072-World-Instance-Flag.patch} (100%) rename patches/server/{0074-lithium-cached-hashcode.patch => 0073-lithium-cached-hashcode.patch} (100%) rename patches/server/{0075-PaperPR-Fix-mobs-spawning-outside-hard-despawn-range.patch => 0074-PaperPR-Fix-mobs-spawning-outside-hard-despawn-range.patch} (100%) rename patches/server/{0076-PaperPR-Fix-CME-in-CraftPersistentDataTypeRegistry.patch => 0075-PaperPR-Fix-CME-in-CraftPersistentDataTypeRegistry.patch} (100%) rename patches/server/{0077-Remove-Eigencraft-redstone-algo.patch => 0076-Remove-Eigencraft-redstone-algo.patch} (100%) rename patches/server/{0078-Port-alternate-current.patch => 0077-Port-alternate-current.patch} (100%) rename patches/server/{0079-lithium-chunk-structure-storage.patch => 0078-lithium-chunk-structure-storage.patch} (100%) rename patches/server/{0080-lithium-ai-task-goat-jump.patch => 0079-lithium-ai-task-goat-jump.patch} (100%) rename patches/server/{0081-lithium-store-gamerules-in-fastutil-hashmap.patch => 0080-lithium-store-gamerules-in-fastutil-hashmap.patch} (100%) rename patches/server/{0082-lithium-fast-math.patch => 0081-lithium-fast-math.patch} (100%) rename patches/server/{0083-lithium-skipping-steps-in-voronoi-using-prediction.patch => 0082-lithium-skipping-steps-in-voronoi-using-prediction.patch} (100%) rename patches/server/{0084-Configurable-enchanting-table-tick.patch => 0083-Configurable-enchanting-table-tick.patch} (100%) diff --git a/patches/server/0069-Don-t-send-equipment-updates-if-only-durability-chan.patch b/patches/server/0068-Don-t-send-equipment-updates-if-only-durability-chan.patch similarity index 100% rename from patches/server/0069-Don-t-send-equipment-updates-if-only-durability-chan.patch rename to patches/server/0068-Don-t-send-equipment-updates-if-only-durability-chan.patch diff --git a/patches/server/0068-PaperPR-Fix-bees-aging-inside-hives.patch b/patches/server/0068-PaperPR-Fix-bees-aging-inside-hives.patch deleted file mode 100644 index 779895f..0000000 --- a/patches/server/0068-PaperPR-Fix-bees-aging-inside-hives.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jake Potrebic -Date: Sat, 21 Aug 2021 21:54:16 -0700 -Subject: [PATCH] PaperPR Fix bees aging inside hives - - -diff --git a/src/main/java/net/minecraft/world/entity/AgeableMob.java b/src/main/java/net/minecraft/world/entity/AgeableMob.java -index c0780a8714808498390282b7fa1da1f3aacf8e2a..d165117d62fe8a55d624966e8c4b626c0f52db39 100644 ---- a/src/main/java/net/minecraft/world/entity/AgeableMob.java -+++ b/src/main/java/net/minecraft/world/entity/AgeableMob.java -@@ -84,7 +84,7 @@ public abstract class AgeableMob extends PathfinderMob { - } - - 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 8eabe7113822d35ff53390e981ea69ad5f07d67d..a7833b801bc3837c60c4235b1f055ae03eff9505 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 -@@ -300,6 +300,7 @@ 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) { -@@ -307,6 +308,7 @@ 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)); - } -@@ -322,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)) { -@@ -330,7 +332,7 @@ 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 - } - } -@@ -422,12 +424,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; - } - } diff --git a/patches/server/0070-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch b/patches/server/0069-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch similarity index 100% rename from patches/server/0070-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch rename to patches/server/0069-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch diff --git a/patches/server/0071-Packet-obfuscation-and-reduction.patch b/patches/server/0070-Packet-obfuscation-and-reduction.patch similarity index 100% rename from patches/server/0071-Packet-obfuscation-and-reduction.patch rename to patches/server/0070-Packet-obfuscation-and-reduction.patch diff --git a/patches/server/0072-Smooth-World-Teleports.patch b/patches/server/0071-Smooth-World-Teleports.patch similarity index 100% rename from patches/server/0072-Smooth-World-Teleports.patch rename to patches/server/0071-Smooth-World-Teleports.patch diff --git a/patches/server/0073-World-Instance-Flag.patch b/patches/server/0072-World-Instance-Flag.patch similarity index 100% rename from patches/server/0073-World-Instance-Flag.patch rename to patches/server/0072-World-Instance-Flag.patch diff --git a/patches/server/0074-lithium-cached-hashcode.patch b/patches/server/0073-lithium-cached-hashcode.patch similarity index 100% rename from patches/server/0074-lithium-cached-hashcode.patch rename to patches/server/0073-lithium-cached-hashcode.patch diff --git a/patches/server/0075-PaperPR-Fix-mobs-spawning-outside-hard-despawn-range.patch b/patches/server/0074-PaperPR-Fix-mobs-spawning-outside-hard-despawn-range.patch similarity index 100% rename from patches/server/0075-PaperPR-Fix-mobs-spawning-outside-hard-despawn-range.patch rename to patches/server/0074-PaperPR-Fix-mobs-spawning-outside-hard-despawn-range.patch diff --git a/patches/server/0076-PaperPR-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0075-PaperPR-Fix-CME-in-CraftPersistentDataTypeRegistry.patch similarity index 100% rename from patches/server/0076-PaperPR-Fix-CME-in-CraftPersistentDataTypeRegistry.patch rename to patches/server/0075-PaperPR-Fix-CME-in-CraftPersistentDataTypeRegistry.patch diff --git a/patches/server/0077-Remove-Eigencraft-redstone-algo.patch b/patches/server/0076-Remove-Eigencraft-redstone-algo.patch similarity index 100% rename from patches/server/0077-Remove-Eigencraft-redstone-algo.patch rename to patches/server/0076-Remove-Eigencraft-redstone-algo.patch diff --git a/patches/server/0078-Port-alternate-current.patch b/patches/server/0077-Port-alternate-current.patch similarity index 100% rename from patches/server/0078-Port-alternate-current.patch rename to patches/server/0077-Port-alternate-current.patch diff --git a/patches/server/0079-lithium-chunk-structure-storage.patch b/patches/server/0078-lithium-chunk-structure-storage.patch similarity index 100% rename from patches/server/0079-lithium-chunk-structure-storage.patch rename to patches/server/0078-lithium-chunk-structure-storage.patch diff --git a/patches/server/0080-lithium-ai-task-goat-jump.patch b/patches/server/0079-lithium-ai-task-goat-jump.patch similarity index 100% rename from patches/server/0080-lithium-ai-task-goat-jump.patch rename to patches/server/0079-lithium-ai-task-goat-jump.patch diff --git a/patches/server/0081-lithium-store-gamerules-in-fastutil-hashmap.patch b/patches/server/0080-lithium-store-gamerules-in-fastutil-hashmap.patch similarity index 100% rename from patches/server/0081-lithium-store-gamerules-in-fastutil-hashmap.patch rename to patches/server/0080-lithium-store-gamerules-in-fastutil-hashmap.patch diff --git a/patches/server/0082-lithium-fast-math.patch b/patches/server/0081-lithium-fast-math.patch similarity index 100% rename from patches/server/0082-lithium-fast-math.patch rename to patches/server/0081-lithium-fast-math.patch diff --git a/patches/server/0083-lithium-skipping-steps-in-voronoi-using-prediction.patch b/patches/server/0082-lithium-skipping-steps-in-voronoi-using-prediction.patch similarity index 100% rename from patches/server/0083-lithium-skipping-steps-in-voronoi-using-prediction.patch rename to patches/server/0082-lithium-skipping-steps-in-voronoi-using-prediction.patch diff --git a/patches/server/0084-Configurable-enchanting-table-tick.patch b/patches/server/0083-Configurable-enchanting-table-tick.patch similarity index 100% rename from patches/server/0084-Configurable-enchanting-table-tick.patch rename to patches/server/0083-Configurable-enchanting-table-tick.patch