Temp drop Cache ominous banner item

2025-12-22 16:29:26 +00:00 · 2024-08-06 02:05:20 +08:00
parent d007b8486e
commit 09bee62de9
46 changed files with 16 additions and 16 deletions
--- a/patches/server/0079-Cache-world-generator-sea-level.patch
+++ b/patches/server/0079-Cache-world-generator-sea-level.patch
--- a/patches/server/0080-Skip-secondary-POI-sensor-if-absent.patch
+++ b/patches/server/0080-Skip-secondary-POI-sensor-if-absent.patch
--- a/patches/server/0081-Optimize-villager-data-storage.patch
+++ b/patches/server/0081-Optimize-villager-data-storage.patch
--- a/patches/server/0082-Skip-entity-move-if-movement-is-zero.patch
+++ b/patches/server/0082-Skip-entity-move-if-movement-is-zero.patch
--- a/patches/server/0083-Store-mob-counts-in-an-array.patch
+++ b/patches/server/0083-Store-mob-counts-in-an-array.patch
--- a/patches/server/0084-Use-linked-map-for-entity-trackers.patch
+++ b/patches/server/0084-Use-linked-map-for-entity-trackers.patch
@@ -13,7 +13,7 @@ As part of: VMP (https://github.com/RelativityMC/VMP-fabric)
 Licensed under: MIT (https://opensource.org/licenses/MIT)

 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index caa295231c7d4573dca04eefcceedd2d067cc903..84d5891ed67e9123f9b8f029fb14f944e34c3332 100644
+index 0cca7c79ced15f9edf03f9593a78e2f155247c4d..e88b5769dab436ce20f6986995a57ccd9cc42950 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -178,7 +178,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
--- a/patches/server/0085-Optimize-noise-generation.patch
+++ b/patches/server/0085-Optimize-noise-generation.patch
--- a/patches/server/0086-Optimize-sheep-offspring-color.patch
+++ b/patches/server/0086-Optimize-sheep-offspring-color.patch
@@ -147,7 +147,7 @@ index 38ac2759894660be1ee7ba59b0bd1270158e9232..eccb524111cec32ed55722817529e6ab
         DyeColor enumcolor1 = ((Sheep) secondParent).getColor();
         CraftingInput craftinginput = Sheep.makeCraftInput(enumcolor, enumcolor1);
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index d7743dc516032a7c8942bce116244e7893e79e0b..89d451b322e9308dfcf7b6579ab558fa7bbc404f 100644
+index f459d398cf9e274b8551540c8a1f707bd609ecb9..2692f835321bb16ecd4185970af01bfa97ca9f1f 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -34,6 +34,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
--- a/patches/server/0087-Hide-flames-on-entities-with-fire-resistance.patch
+++ b/patches/server/0087-Hide-flames-on-entities-with-fire-resistance.patch
@@ -13,7 +13,7 @@ As part of: Slice (https://github.com/Cryptite/Slice)
 Licensed under: MIT (https://opensource.org/licenses/MIT)

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f5708e511611ec64430336f8247526b4a0a062aa..f55019443b3f33dc4e0f845e5906078b1257175a 100644
+index d507da667083632b58967122d34bd1089f398d68..aab6604b436a33c2481c69e240ca1028ddb24a59 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -916,7 +916,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -31,7 +31,7 @@ index f5708e511611ec64430336f8247526b4a0a062aa..f55019443b3f33dc4e0f845e5906078b
 
         this.firstTick = false;
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 89d451b322e9308dfcf7b6579ab558fa7bbc404f..38488750f556ebae7ed41a24b88f5752f3b54ec7 100644
+index 2692f835321bb16ecd4185970af01bfa97ca9f1f..93f4be842259ede94c94588f266c2270546e8311 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -126,6 +126,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
--- a/patches/server/0088-Skip-cloning-advancement-criteria.patch
+++ b/patches/server/0088-Skip-cloning-advancement-criteria.patch
--- a/patches/server/0089-Reduce-block-destruction-packet-allocations.patch
+++ b/patches/server/0089-Reduce-block-destruction-packet-allocations.patch
--- a/patches/server/0090-Spread-out-sending-all-player-info.patch
+++ b/patches/server/0090-Spread-out-sending-all-player-info.patch
--- a/patches/server/0091-Optimize-player-list-for-sending-player-info.patch
+++ b/patches/server/0091-Optimize-player-list-for-sending-player-info.patch
--- a/patches/server/0092-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
+++ b/patches/server/0092-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
--- a/patches/server/0093-Send-multiple-keep-alive-packets.patch
+++ b/patches/server/0093-Send-multiple-keep-alive-packets.patch
@@ -130,7 +130,7 @@ index 8757a6ac609d463f94846d66fe04f50e859e7ce8..a720a05c47b2137a07515461960603cc
 
     }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 97c390c72b8e70affb35487138c55f214953f8e6..e533bb09c9eec023ec44e559969f2cb0f166d95b 100644
+index bb96ee69a76a1acd29e680df8de55b92c72aa21a..08199435320f31421cd2b70b221fd519fdac0b59 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -9,6 +9,8 @@ import com.mojang.brigadier.suggestion.Suggestions;
--- a/patches/server/0094-Make-slow-login-timeout-configurable.patch
+++ b/patches/server/0094-Make-slow-login-timeout-configurable.patch
--- a/patches/server/0095-Load-portal-destination-chunk-before-entity-teleport.patch
+++ b/patches/server/0095-Load-portal-destination-chunk-before-entity-teleport.patch
@@ -13,7 +13,7 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f55019443b3f33dc4e0f845e5906078b1257175a..e748a67d9ba349574462a7fb27a5dca69a571dc9 100644
+index aab6604b436a33c2481c69e240ca1028ddb24a59..537345d76f47ee8c14ce57577e7bb3146e48e963 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4005,7 +4005,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -33,7 +33,7 @@ index f55019443b3f33dc4e0f845e5906078b1257175a..e748a67d9ba349574462a7fb27a5dca6
             entity.restoreFrom(this);
             entity.moveTo(destX, destY, destZ, yaw, f2);
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 38488750f556ebae7ed41a24b88f5752f3b54ec7..4c9bb806aa6509894de7f09b633c0c3d74b17233 100644
+index 93f4be842259ede94c94588f266c2270546e8311..fd5d02f8b1b1e2e84e6bda4885f091a000cbcbc9 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -124,6 +124,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
--- a/patches/server/0096-Don-t-load-chunks-to-spawn-phantoms.patch
+++ b/patches/server/0096-Don-t-load-chunks-to-spawn-phantoms.patch
@@ -34,7 +34,7 @@ index 1b1b475ca27e799e251d6f8a8c9fe1a4fd8bae83..ae1e164285f5675371bf036c8a564d9f
 
                                         if (NaturalSpawner.isValidEmptySpawnBlock(world, blockposition1, iblockdata, fluid, EntityType.PHANTOM)) {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 4c9bb806aa6509894de7f09b633c0c3d74b17233..7f13c5c2a9185104cd958b75c45f4ba02cda0c95 100644
+index fd5d02f8b1b1e2e84e6bda4885f091a000cbcbc9..e648d995fe9d2b44e66cb50e3f894b3524f77fef 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -92,6 +92,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
--- a/patches/server/0097-Don-t-load-chunks-to-activate-climbing-entities.patch
+++ b/patches/server/0097-Don-t-load-chunks-to-activate-climbing-entities.patch
@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e748a67d9ba349574462a7fb27a5dca69a571dc9..c9896eb6e0bfd8893afda48299e61039c6544a9b 100644
+index 537345d76f47ee8c14ce57577e7bb3146e48e963..517d6fe26a7bb5fb8ca9ecb39245492a2a07e80b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4656,6 +4656,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -79,7 +79,7 @@ index f3540a3ade105d78952e9bf0c07ca05ef3f1bbc3..b28b20b228986abc933449896040f695
             if (iblockdata.is(BlockTags.CLIMBABLE)) {
                 this.lastClimbablePos = Optional.of(blockposition);
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 7f13c5c2a9185104cd958b75c45f4ba02cda0c95..269393f8b56ed5b5e37879c23fe1e28b5a82ebe0 100644
+index e648d995fe9d2b44e66cb50e3f894b3524f77fef..17b1a7a2e0b557354f0c4ea2f92d9105bcd5cf2c 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -95,6 +95,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
--- a/patches/server/0098-Broadcast-crit-animations-as-the-entity-being-critte.patch
+++ b/patches/server/0098-Broadcast-crit-animations-as-the-entity-being-critte.patch
@@ -38,7 +38,7 @@ index 36d009fb72351457fc238b250b097878f30db246..15d016885c46bbf7417b14142d9aca25
 
     @Override
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 269393f8b56ed5b5e37879c23fe1e28b5a82ebe0..687549714e928ea74be154c84d04ffd453dc324d 100644
+index 17b1a7a2e0b557354f0c4ea2f92d9105bcd5cf2c..1efeb37086f5c897f2f1ae1ecdc713f1e3a55ede 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -106,6 +106,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
--- a/patches/server/0099-Ignore-null-legacy-structure-data.patch
+++ b/patches/server/0099-Ignore-null-legacy-structure-data.patch
--- a/patches/server/0100-Skip-unnecessary-mob-spawning-computations.patch
+++ b/patches/server/0100-Skip-unnecessary-mob-spawning-computations.patch
--- a/patches/server/0101-Prevent-entities-random-strolling-into-non-ticking-c.patch
+++ b/patches/server/0101-Prevent-entities-random-strolling-into-non-ticking-c.patch
@@ -36,7 +36,7 @@ index 676e1580849e8942eb41c7a3a80f464138b22764..9e4d0493aa814a392742c9ddc1815211
             } else {
                 this.wantedX = vec3.x;
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 687549714e928ea74be154c84d04ffd453dc324d..76718d966a326ba82a92217a9f0fdf5b17f9d643 100644
+index 1efeb37086f5c897f2f1ae1ecdc713f1e3a55ede..15b351e23ca2daac2a903d58774f2a9bf3b4b070 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -137,6 +137,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
--- a/patches/server/0102-Do-not-place-player-in-world-if-kicked-before-being-.patch
+++ b/patches/server/0102-Do-not-place-player-in-world-if-kicked-before-being-.patch
--- a/patches/server/0103-CraftBukkit-UUID-to-world-map.patch
+++ b/patches/server/0103-CraftBukkit-UUID-to-world-map.patch
--- a/patches/server/0104-Global-EULA-file.patch
+++ b/patches/server/0104-Global-EULA-file.patch
--- a/patches/server/0105-Specific-interval-TPS-API.patch
+++ b/patches/server/0105-Specific-interval-TPS-API.patch
--- a/patches/server/0106-5-second-TPS-average.patch
+++ b/patches/server/0106-5-second-TPS-average.patch
--- a/patches/server/0107-Measure-last-tick-time.patch
+++ b/patches/server/0107-Measure-last-tick-time.patch
--- a/patches/server/0108-Last-tick-time-API.patch
+++ b/patches/server/0108-Last-tick-time-API.patch
--- a/patches/server/0109-Show-last-tick-time-in-tps-command.patch
+++ b/patches/server/0109-Show-last-tick-time-in-tps-command.patch
--- a/patches/server/0110-Increase-time-statistics-in-intervals.patch
+++ b/patches/server/0110-Increase-time-statistics-in-intervals.patch
--- a/patches/server/0111-For-collision-check-has-physics-before-same-vehicle.patch
+++ b/patches/server/0111-For-collision-check-has-physics-before-same-vehicle.patch
@@ -16,7 +16,7 @@ As part of: Akarin (https://github.com/Akarin-project/Akarin)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c9896eb6e0bfd8893afda48299e61039c6544a9b..99150908bd7d344e82dd05166bbab83d167086ea 100644
+index 517d6fe26a7bb5fb8ca9ecb39245492a2a07e80b..77128d165d582883e48b4d6527070d276f6d3c37 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2188,8 +2188,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
--- a/patches/server/0112-Skip-negligible-planar-movement-multiplication.patch
+++ b/patches/server/0112-Skip-negligible-planar-movement-multiplication.patch
@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 99150908bd7d344e82dd05166bbab83d167086ea..29f12201886905a6d73c52d1b59c53341841d878 100644
+index 77128d165d582883e48b4d6527070d276f6d3c37..cdf7063bc7ae02652c55363e44c9ae809a999436 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1274,9 +1274,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
--- a/patches/server/0113-Optimize-matching-item-checks.patch
+++ b/patches/server/0113-Optimize-matching-item-checks.patch
--- a/patches/server/0114-Pre-compute-VarLong-sizes.patch
+++ b/patches/server/0114-Pre-compute-VarLong-sizes.patch
--- a/patches/server/0115-Optimize-VarInt-write-and-VarLong-write.patch
+++ b/patches/server/0115-Optimize-VarInt-write-and-VarLong-write.patch
--- a/patches/server/0116-Reduce-RandomSource-instances.patch
+++ b/patches/server/0116-Reduce-RandomSource-instances.patch
@@ -74,7 +74,7 @@ index 1223c5d23d0ea6aed068bdf0f5725e2ad49fc82c..5df85ba4904a6b4b69ab584e9f30d34c
         this.currentState = FishingHook.FishHookState.FLYING;
         this.noCulling = true;
 diff --git a/src/main/java/net/minecraft/world/entity/raid/Raid.java b/src/main/java/net/minecraft/world/entity/raid/Raid.java
-index 539e17bdeefd0be17a46cb65e034c7e0e4df181c..fbc95098b45478a8da395b9816c86571959d179c 100644
+index 5c0e5803284bfc82c2dd8bba9ded0ba7aac4962a..2cc37e5734233954710c4ef55bf3b2918f2026d5 100644
 --- a/src/main/java/net/minecraft/world/entity/raid/Raid.java
 +++ b/src/main/java/net/minecraft/world/entity/raid/Raid.java
@@ -116,7 +116,7 @@ public class Raid {
--- a/patches/server/0117-Add-xor-shift-random.patch
+++ b/patches/server/0117-Add-xor-shift-random.patch
--- a/patches/server/0118-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch
+++ b/patches/server/0118-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch
--- a/patches/server/0119-Initialize-line-of-sight-cache-with-low-capacity.patch
+++ b/patches/server/0119-Initialize-line-of-sight-cache-with-low-capacity.patch
--- a/patches/server/0120-Reduce-line-of-sight-updates-and-cache-lookups.patch
+++ b/patches/server/0120-Reduce-line-of-sight-updates-and-cache-lookups.patch
--- a/patches/server/0121-Server-thread-priority-environment-variable.patch
+++ b/patches/server/0121-Server-thread-priority-environment-variable.patch
@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org

 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fb204e4313fba919e06a7abd4c2f86a8630f9d0f..52a37cd37d5376c329c46c5c6775fc7590d2cf40 100644
+index b01b536b41913dd78ef752a5fbce399461c97a00..f4dd63ae1a9715f3cd10949ca49a269897443e56 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -191,6 +191,8 @@ import co.aikar.timings.MinecraftTimings; // Paper
--- a/patches/server/0122-Virtual-thread-support.patch
+++ b/patches/server/0122-Virtual-thread-support.patch
--- a/patches/removed/server/0046-Don-t-trigger-lootable-refresh-for-non-player-intera.patch
+++ b/patches/removed/server/0046-Don-t-trigger-lootable-refresh-for-non-player-intera.patch
--- a/patches/work/server/0079-Cache-ominous-banner-item.patch
+++ b/patches/work/server/0079-Cache-ominous-banner-item.patch