From 1844e54a158ca5f2cf8696d589d4d68ffefb58ad Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Mon, 24 Jun 2024 09:41:50 +0800 Subject: [PATCH] Add back cache ominous banner item --- .../0084-Cache-ominous-banner-item.patch | 173 ++++++++++++++++++ ...085-Cache-world-generator-sea-level.patch} | 0 ...Skip-secondary-POI-sensor-if-absent.patch} | 0 ...kip-entity-move-if-movement-is-zero.patch} | 0 ...> 0088-Store-mob-counts-in-an-array.patch} | 0 ...-Use-linked-map-for-entity-trackers.patch} | 0 ...h => 0090-Optimize-noise-generation.patch} | 0 ...0091-Optimize-sheep-offspring-color.patch} | 0 ...es-on-entities-with-fire-resistance.patch} | 2 +- ...3-Skip-cloning-advancement-criteria.patch} | 0 ...lock-destruction-packet-allocations.patch} | 2 +- ...-Spread-out-sending-all-player-info.patch} | 4 +- ...player-list-for-sending-player-info.patch} | 2 +- ...dSendEvent-if-there-are-no-listener.patch} | 0 ...98-Send-multiple-keep-alive-packets.patch} | 2 +- ...ake-slow-login-timeout-configurable.patch} | 0 ...nation-chunk-before-entity-teleport.patch} | 0 ...Don-t-load-chunks-to-spawn-phantoms.patch} | 0 ...hunks-to-activate-climbing-entities.patch} | 0 ...imations-as-the-entity-being-critte.patch} | 0 ...4-Ignore-null-legacy-structure-data.patch} | 0 ...necessary-mob-spawning-computations.patch} | 0 ...random-strolling-into-non-ticking-c.patch} | 0 ...er-in-world-if-kicked-before-being-.patch} | 2 +- ... 0108-CraftBukkit-UUID-to-world-map.patch} | 0 ...file.patch => 0109-Global-EULA-file.patch} | 0 ...h => 0110-Specific-interval-TPS-API.patch} | 0 ....patch => 0111-5-second-TPS-average.patch} | 0 ...atch => 0112-Measure-last-tick-time.patch} | 0 ...PI.patch => 0113-Last-tick-time-API.patch} | 0 ...-Show-last-tick-time-in-tps-command.patch} | 0 ...crease-time-statistics-in-intervals.patch} | 2 +- ...eck-has-physics-before-same-vehicle.patch} | 0 ...ible-planar-movement-multiplication.patch} | 0 ... 0118-Optimize-matching-item-checks.patch} | 0 ...h => 0119-Pre-compute-VarLong-sizes.patch} | 0 ...mize-VarInt-write-and-VarLong-write.patch} | 0 ... 0121-Reduce-RandomSource-instances.patch} | 2 +- ...Stack-lookups-for-reduced-visibilit.patch} | 0 ...ne-of-sight-cache-with-low-capacity.patch} | 0 ...-of-sight-updates-and-cache-lookups.patch} | 0 ...hread-priority-environment-variable.patch} | 0 ...atch => 0126-Virtual-thread-support.patch} | 0 43 files changed, 182 insertions(+), 9 deletions(-) create mode 100644 patches/server/0084-Cache-ominous-banner-item.patch rename patches/server/{0084-Cache-world-generator-sea-level.patch => 0085-Cache-world-generator-sea-level.patch} (100%) rename patches/server/{0085-Skip-secondary-POI-sensor-if-absent.patch => 0086-Skip-secondary-POI-sensor-if-absent.patch} (100%) rename patches/server/{0086-Skip-entity-move-if-movement-is-zero.patch => 0087-Skip-entity-move-if-movement-is-zero.patch} (100%) rename patches/server/{0087-Store-mob-counts-in-an-array.patch => 0088-Store-mob-counts-in-an-array.patch} (100%) rename patches/server/{0088-Use-linked-map-for-entity-trackers.patch => 0089-Use-linked-map-for-entity-trackers.patch} (100%) rename patches/server/{0089-Optimize-noise-generation.patch => 0090-Optimize-noise-generation.patch} (100%) rename patches/server/{0090-Optimize-sheep-offspring-color.patch => 0091-Optimize-sheep-offspring-color.patch} (100%) rename patches/server/{0091-Hide-flames-on-entities-with-fire-resistance.patch => 0092-Hide-flames-on-entities-with-fire-resistance.patch} (96%) rename patches/server/{0092-Skip-cloning-advancement-criteria.patch => 0093-Skip-cloning-advancement-criteria.patch} (100%) rename patches/server/{0093-Reduce-block-destruction-packet-allocations.patch => 0094-Reduce-block-destruction-packet-allocations.patch} (95%) rename patches/server/{0094-Spread-out-sending-all-player-info.patch => 0095-Spread-out-sending-all-player-info.patch} (98%) rename patches/server/{0095-Optimize-player-list-for-sending-player-info.patch => 0096-Optimize-player-list-for-sending-player-info.patch} (97%) rename patches/server/{0096-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch => 0097-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch} (100%) rename patches/server/{0097-Send-multiple-keep-alive-packets.patch => 0098-Send-multiple-keep-alive-packets.patch} (99%) rename patches/server/{0098-Make-slow-login-timeout-configurable.patch => 0099-Make-slow-login-timeout-configurable.patch} (100%) rename patches/server/{0099-Load-portal-destination-chunk-before-entity-teleport.patch => 0100-Load-portal-destination-chunk-before-entity-teleport.patch} (100%) rename patches/server/{0100-Don-t-load-chunks-to-spawn-phantoms.patch => 0101-Don-t-load-chunks-to-spawn-phantoms.patch} (100%) rename patches/server/{0101-Don-t-load-chunks-to-activate-climbing-entities.patch => 0102-Don-t-load-chunks-to-activate-climbing-entities.patch} (100%) rename patches/server/{0102-Broadcast-crit-animations-as-the-entity-being-critte.patch => 0103-Broadcast-crit-animations-as-the-entity-being-critte.patch} (100%) rename patches/server/{0103-Ignore-null-legacy-structure-data.patch => 0104-Ignore-null-legacy-structure-data.patch} (100%) rename patches/server/{0104-Skip-unnecessary-mob-spawning-computations.patch => 0105-Skip-unnecessary-mob-spawning-computations.patch} (100%) rename patches/server/{0105-Prevent-entities-random-strolling-into-non-ticking-c.patch => 0106-Prevent-entities-random-strolling-into-non-ticking-c.patch} (100%) rename patches/server/{0106-Do-not-place-player-in-world-if-kicked-before-being-.patch => 0107-Do-not-place-player-in-world-if-kicked-before-being-.patch} (94%) rename patches/server/{0107-CraftBukkit-UUID-to-world-map.patch => 0108-CraftBukkit-UUID-to-world-map.patch} (100%) rename patches/server/{0108-Global-EULA-file.patch => 0109-Global-EULA-file.patch} (100%) rename patches/server/{0109-Specific-interval-TPS-API.patch => 0110-Specific-interval-TPS-API.patch} (100%) rename patches/server/{0110-5-second-TPS-average.patch => 0111-5-second-TPS-average.patch} (100%) rename patches/server/{0111-Measure-last-tick-time.patch => 0112-Measure-last-tick-time.patch} (100%) rename patches/server/{0112-Last-tick-time-API.patch => 0113-Last-tick-time-API.patch} (100%) rename patches/server/{0113-Show-last-tick-time-in-tps-command.patch => 0114-Show-last-tick-time-in-tps-command.patch} (100%) rename patches/server/{0114-Increase-time-statistics-in-intervals.patch => 0115-Increase-time-statistics-in-intervals.patch} (98%) rename patches/server/{0115-For-collision-check-has-physics-before-same-vehicle.patch => 0116-For-collision-check-has-physics-before-same-vehicle.patch} (100%) rename patches/server/{0116-Skip-negligible-planar-movement-multiplication.patch => 0117-Skip-negligible-planar-movement-multiplication.patch} (100%) rename patches/server/{0117-Optimize-matching-item-checks.patch => 0118-Optimize-matching-item-checks.patch} (100%) rename patches/server/{0118-Pre-compute-VarLong-sizes.patch => 0119-Pre-compute-VarLong-sizes.patch} (100%) rename patches/server/{0119-Optimize-VarInt-write-and-VarLong-write.patch => 0120-Optimize-VarInt-write-and-VarLong-write.patch} (100%) rename patches/server/{0120-Reduce-RandomSource-instances.patch => 0121-Reduce-RandomSource-instances.patch} (99%) rename patches/server/{0121-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch => 0122-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch} (100%) rename patches/server/{0122-Initialize-line-of-sight-cache-with-low-capacity.patch => 0123-Initialize-line-of-sight-cache-with-low-capacity.patch} (100%) rename patches/server/{0123-Reduce-line-of-sight-updates-and-cache-lookups.patch => 0124-Reduce-line-of-sight-updates-and-cache-lookups.patch} (100%) rename patches/server/{0124-Server-thread-priority-environment-variable.patch => 0125-Server-thread-priority-environment-variable.patch} (100%) rename patches/server/{0125-Virtual-thread-support.patch => 0126-Virtual-thread-support.patch} (100%) diff --git a/patches/server/0084-Cache-ominous-banner-item.patch b/patches/server/0084-Cache-ominous-banner-item.patch new file mode 100644 index 0000000..12a01d5 --- /dev/null +++ b/patches/server/0084-Cache-ominous-banner-item.patch @@ -0,0 +1,173 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Martijn Muijsers +Date: Thu, 1 Dec 2022 00:37:50 +0100 +Subject: [PATCH] Cache ominous banner item + +License: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) +Gale - https://galemc.org + +This patch is based on the following mixin: +"me/jellysquid/mods/lithium/mixin/ai/raid/RaiderEntityMixin.java" +By: 2No2Name <2No2Name@web.de> +As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) +Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) + +diff --git a/src/main/java/net/minecraft/advancements/critereon/EntityEquipmentPredicate.java b/src/main/java/net/minecraft/advancements/critereon/EntityEquipmentPredicate.java +index ff9d99feb75a8e0f695b8f2696bd79baccf77e01..1712e45439e3ebcb61703ac30eaa92e85f99b676 100644 +--- a/src/main/java/net/minecraft/advancements/critereon/EntityEquipmentPredicate.java ++++ b/src/main/java/net/minecraft/advancements/critereon/EntityEquipmentPredicate.java +@@ -40,7 +40,7 @@ public record EntityEquipmentPredicate( + .head( + ItemPredicate.Builder.item() + .of(Items.WHITE_BANNER) +- .hasComponents(DataComponentPredicate.allOf(Raid.getLeaderBannerInstance(bannerPatternLookup).getComponents())) ++ .hasComponents(DataComponentPredicate.allOf(Raid.getLeaderBanner(bannerPatternLookup).getComponents())) // Gale - Lithium - cache ominous banner item + ) + .build(); + } +diff --git a/src/main/java/net/minecraft/data/advancements/packs/VanillaAdventureAdvancements.java b/src/main/java/net/minecraft/data/advancements/packs/VanillaAdventureAdvancements.java +index 09d93c4814ee918d4a2d73794bcd5bdda5a4f8eb..3187956a47182951d239a6d3cc5a8c79ba9c5b38 100644 +--- a/src/main/java/net/minecraft/data/advancements/packs/VanillaAdventureAdvancements.java ++++ b/src/main/java/net/minecraft/data/advancements/packs/VanillaAdventureAdvancements.java +@@ -394,7 +394,7 @@ public class VanillaAdventureAdvancements implements AdvancementSubProvider { + AdvancementHolder advancementHolder8 = Advancement.Builder.advancement() + .parent(advancementHolder) + .display( +- Raid.getLeaderBannerInstance(registryLookup), ++ Raid.getLeaderBanner(registryLookup), // Gale - Lithium - cache ominous banner item + Component.translatable("advancements.adventure.voluntary_exile.title"), + Component.translatable("advancements.adventure.voluntary_exile.description"), + null, +@@ -413,7 +413,7 @@ public class VanillaAdventureAdvancements implements AdvancementSubProvider { + Advancement.Builder.advancement() + .parent(advancementHolder8) + .display( +- Raid.getLeaderBannerInstance(registryLookup), ++ Raid.getLeaderBanner(registryLookup), // Gale - Lithium - cache ominous banner item + Component.translatable("advancements.adventure.hero_of_the_village.title"), + Component.translatable("advancements.adventure.hero_of_the_village.description"), + null, +diff --git a/src/main/java/net/minecraft/server/commands/RaidCommand.java b/src/main/java/net/minecraft/server/commands/RaidCommand.java +index 774bc4b5bc8c56ff3b0997de5eb1c46ef9ea7d2e..468dd8f6372751f52c0bedef19879a12de412789 100644 +--- a/src/main/java/net/minecraft/server/commands/RaidCommand.java ++++ b/src/main/java/net/minecraft/server/commands/RaidCommand.java +@@ -95,7 +95,7 @@ public class RaidCommand { + return 0; + } else { + raider.setPatrolLeader(true); +- raider.setItemSlot(EquipmentSlot.HEAD, Raid.getLeaderBannerInstance(source.registryAccess().lookupOrThrow(Registries.BANNER_PATTERN))); ++ raider.setItemSlot(EquipmentSlot.HEAD, Raid.getLeaderBanner(source.registryAccess().lookupOrThrow(Registries.BANNER_PATTERN))); // Gale - Lithium - cache ominous banner item + raider.setPos(source.getPosition().x, source.getPosition().y, source.getPosition().z); + raider.finalizeSpawn( + source.getLevel(), source.getLevel().getCurrentDifficultyAt(BlockPos.containing(source.getPosition())), MobSpawnType.COMMAND, null +diff --git a/src/main/java/net/minecraft/world/entity/monster/PatrollingMonster.java b/src/main/java/net/minecraft/world/entity/monster/PatrollingMonster.java +index 7e1a4b69291e14dc0323b3f40aa4acce8c4b0acf..1ddc36fdf98b5d7ec1658fe3d2eb38eff6634a52 100644 +--- a/src/main/java/net/minecraft/world/entity/monster/PatrollingMonster.java ++++ b/src/main/java/net/minecraft/world/entity/monster/PatrollingMonster.java +@@ -74,7 +74,7 @@ public abstract class PatrollingMonster extends Monster { + } + + if (this.isPatrolLeader()) { +- this.setItemSlot(EquipmentSlot.HEAD, Raid.getLeaderBannerInstance(this.registryAccess().lookupOrThrow(Registries.BANNER_PATTERN))); ++ this.setItemSlot(EquipmentSlot.HEAD, Raid.getLeaderBanner(this.registryAccess().lookupOrThrow(Registries.BANNER_PATTERN))); // Gale - Lithium - cache ominous banner item + this.setDropChance(EquipmentSlot.HEAD, 2.0F); + } + +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 5c0e5803284bfc82c2dd8bba9ded0ba7aac4962a..539e17bdeefd0be17a46cb65e034c7e0e4df181c 100644 +--- a/src/main/java/net/minecraft/world/entity/raid/Raid.java ++++ b/src/main/java/net/minecraft/world/entity/raid/Raid.java +@@ -725,7 +725,7 @@ public class Raid { + this.level.getRaids().setDirty(); + } + +- public static ItemStack getLeaderBannerInstance(HolderGetter bannerPatternLookup) { ++ private static ItemStack createLeaderBanner(HolderGetter bannerPatternLookup) { // Gale - Lithium - cache ominous banner item + ItemStack itemstack = new ItemStack(Items.WHITE_BANNER); + BannerPatternLayers bannerpatternlayers = (new BannerPatternLayers.Builder()).addIfRegistered(bannerPatternLookup, BannerPatterns.RHOMBUS_MIDDLE, DyeColor.CYAN).addIfRegistered(bannerPatternLookup, BannerPatterns.STRIPE_BOTTOM, DyeColor.LIGHT_GRAY).addIfRegistered(bannerPatternLookup, BannerPatterns.STRIPE_CENTER, DyeColor.GRAY).addIfRegistered(bannerPatternLookup, BannerPatterns.BORDER, DyeColor.LIGHT_GRAY).addIfRegistered(bannerPatternLookup, BannerPatterns.STRIPE_MIDDLE, DyeColor.BLACK).addIfRegistered(bannerPatternLookup, BannerPatterns.HALF_HORIZONTAL, DyeColor.LIGHT_GRAY).addIfRegistered(bannerPatternLookup, BannerPatterns.CIRCLE_MIDDLE, DyeColor.LIGHT_GRAY).addIfRegistered(bannerPatternLookup, BannerPatterns.BORDER, DyeColor.BLACK).build(); + +@@ -735,6 +735,22 @@ public class Raid { + return itemstack; + } + ++ // Gale start - Lithium - cache ominous banner item ++ public static ItemStack LEADER_BANNER = ItemStack.EMPTY; ++ ++ public static ItemStack getLeaderBanner(HolderGetter bannerPatternLookup) { ++ if (LEADER_BANNER.equals(ItemStack.EMPTY)) { ++ LEADER_BANNER = createLeaderBanner(bannerPatternLookup); ++ } ++ ++ return LEADER_BANNER; ++ } ++ ++ public static ItemStack getLeaderBannerInstance(HolderGetter bannerPatternLookup) { ++ return getLeaderBanner(bannerPatternLookup).copy(); ++ } ++ // Gale end - Lithium - cache ominous banner item ++ + @Nullable + public Raider getLeader(int wave) { + return (Raider) this.groupToLeaderMap.get(wave); +@@ -803,7 +819,7 @@ public class Raid { + + public void setLeader(int wave, Raider entity) { + this.groupToLeaderMap.put(wave, entity); +- entity.setItemSlot(EquipmentSlot.HEAD, Raid.getLeaderBannerInstance(entity.registryAccess().lookupOrThrow(Registries.BANNER_PATTERN))); ++ entity.setItemSlot(EquipmentSlot.HEAD, Raid.getLeaderBanner(entity.registryAccess().lookupOrThrow(Registries.BANNER_PATTERN))); // Gale - Lithium - cache ominous banner item + entity.setDropChance(EquipmentSlot.HEAD, 2.0F); + } + +diff --git a/src/main/java/net/minecraft/world/entity/raid/Raider.java b/src/main/java/net/minecraft/world/entity/raid/Raider.java +index bbf21ea433f9e3963aac0ede597ed8d3c8e50ed8..9c958635f9b9ca82d49062fdc35b7ebadf02bb2f 100644 +--- a/src/main/java/net/minecraft/world/entity/raid/Raider.java ++++ b/src/main/java/net/minecraft/world/entity/raid/Raider.java +@@ -45,7 +45,7 @@ public abstract class Raider extends PatrollingMonster { + + protected static final EntityDataAccessor IS_CELEBRATING = SynchedEntityData.defineId(Raider.class, EntityDataSerializers.BOOLEAN); + static final Predicate ALLOWED_ITEMS = (entityitem) -> { +- return !entityitem.hasPickUpDelay() && entityitem.isAlive() && ItemStack.matches(entityitem.getItem(), Raid.getLeaderBannerInstance(entityitem.registryAccess().lookupOrThrow(Registries.BANNER_PATTERN))); ++ return !entityitem.hasPickUpDelay() && entityitem.isAlive() && ItemStack.matches(entityitem.getItem(), Raid.getLeaderBanner(entityitem.registryAccess().lookupOrThrow(Registries.BANNER_PATTERN))); // Gale - Lithium - cache ominous banner item + }; + @Nullable + protected Raid raid; +@@ -152,7 +152,7 @@ public abstract class Raider extends PatrollingMonster { + + public boolean isCaptain() { + ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD); +- boolean flag = !itemstack.isEmpty() && ItemStack.matches(itemstack, Raid.getLeaderBannerInstance(this.registryAccess().lookupOrThrow(Registries.BANNER_PATTERN))); ++ boolean flag = !itemstack.isEmpty() && ItemStack.matches(itemstack, Raid.getLeaderBanner(this.registryAccess().lookupOrThrow(Registries.BANNER_PATTERN))); // Gale - Lithium - cache ominous banner item + boolean flag1 = this.isPatrolLeader(); + + return flag && flag1; +@@ -224,7 +224,7 @@ public abstract class Raider extends PatrollingMonster { + ItemStack itemstack = item.getItem(); + boolean flag = this.hasActiveRaid() && this.getCurrentRaid().getLeader(this.getWave()) != null; + +- if (this.hasActiveRaid() && !flag && ItemStack.matches(itemstack, Raid.getLeaderBannerInstance(this.registryAccess().lookupOrThrow(Registries.BANNER_PATTERN)))) { ++ if (this.hasActiveRaid() && !flag && ItemStack.matches(itemstack, Raid.getLeaderBanner(this.registryAccess().lookupOrThrow(Registries.BANNER_PATTERN)))) { // Gale - Lithium - cache ominous banner item + // Paper start - EntityPickupItemEvent fixes + if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityPickupItemEvent(this, item, 0, false).isCancelled()) { + return; +@@ -302,7 +302,7 @@ public abstract class Raider extends PatrollingMonster { + if (!this.mob.level().getGameRules().getBoolean(net.minecraft.world.level.GameRules.RULE_MOBGRIEFING) || !this.mob.canPickUpLoot()) return false; // Paper - respect game and entity rules for picking up items + Raid raid = this.mob.getCurrentRaid(); + +- if (this.mob.hasActiveRaid() && !this.mob.getCurrentRaid().isOver() && this.mob.canBeLeader() && !ItemStack.matches(this.mob.getItemBySlot(EquipmentSlot.HEAD), Raid.getLeaderBannerInstance(this.mob.registryAccess().lookupOrThrow(Registries.BANNER_PATTERN)))) { ++ if (this.mob.hasActiveRaid() && !this.mob.getCurrentRaid().isOver() && this.mob.canBeLeader() && !ItemStack.matches(this.mob.getItemBySlot(EquipmentSlot.HEAD), Raid.getLeaderBanner(this.mob.registryAccess().lookupOrThrow(Registries.BANNER_PATTERN)))) { // Gale - Lithium - cache ominous banner item + Raider entityraider = raid.getLeader(this.mob.getWave()); + + if (entityraider == null || !entityraider.isAlive()) { +diff --git a/src/main/java/net/minecraft/world/item/CreativeModeTabs.java b/src/main/java/net/minecraft/world/item/CreativeModeTabs.java +index 3c5f820fb4ee554e94f417a911922af6c4943e3c..509f1fd055fc4e2b50023ef8c29b190c81bca170 100644 +--- a/src/main/java/net/minecraft/world/item/CreativeModeTabs.java ++++ b/src/main/java/net/minecraft/world/item/CreativeModeTabs.java +@@ -1103,7 +1103,7 @@ public class CreativeModeTabs { + entries.accept(Items.PURPLE_BANNER); + entries.accept(Items.MAGENTA_BANNER); + entries.accept(Items.PINK_BANNER); +- entries.accept(Raid.getLeaderBannerInstance(displayContext.holders().lookupOrThrow(Registries.BANNER_PATTERN))); ++ entries.accept(Raid.getLeaderBanner(displayContext.holders().lookupOrThrow(Registries.BANNER_PATTERN))); // Gale - Lithium - cache ominous banner item + entries.accept(Items.SKELETON_SKULL); + entries.accept(Items.WITHER_SKELETON_SKULL); + entries.accept(Items.PLAYER_HEAD); diff --git a/patches/server/0084-Cache-world-generator-sea-level.patch b/patches/server/0085-Cache-world-generator-sea-level.patch similarity index 100% rename from patches/server/0084-Cache-world-generator-sea-level.patch rename to patches/server/0085-Cache-world-generator-sea-level.patch diff --git a/patches/server/0085-Skip-secondary-POI-sensor-if-absent.patch b/patches/server/0086-Skip-secondary-POI-sensor-if-absent.patch similarity index 100% rename from patches/server/0085-Skip-secondary-POI-sensor-if-absent.patch rename to patches/server/0086-Skip-secondary-POI-sensor-if-absent.patch diff --git a/patches/server/0086-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0087-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0086-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0087-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0087-Store-mob-counts-in-an-array.patch b/patches/server/0088-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0087-Store-mob-counts-in-an-array.patch rename to patches/server/0088-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0088-Use-linked-map-for-entity-trackers.patch b/patches/server/0089-Use-linked-map-for-entity-trackers.patch similarity index 100% rename from patches/server/0088-Use-linked-map-for-entity-trackers.patch rename to patches/server/0089-Use-linked-map-for-entity-trackers.patch diff --git a/patches/server/0089-Optimize-noise-generation.patch b/patches/server/0090-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0089-Optimize-noise-generation.patch rename to patches/server/0090-Optimize-noise-generation.patch diff --git a/patches/server/0090-Optimize-sheep-offspring-color.patch b/patches/server/0091-Optimize-sheep-offspring-color.patch similarity index 100% rename from patches/server/0090-Optimize-sheep-offspring-color.patch rename to patches/server/0091-Optimize-sheep-offspring-color.patch diff --git a/patches/server/0091-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0092-Hide-flames-on-entities-with-fire-resistance.patch similarity index 96% rename from patches/server/0091-Hide-flames-on-entities-with-fire-resistance.patch rename to patches/server/0092-Hide-flames-on-entities-with-fire-resistance.patch index 07f5f9f..9b50b27 100644 --- a/patches/server/0091-Hide-flames-on-entities-with-fire-resistance.patch +++ b/patches/server/0092-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 329856d3656da0fd01ab1500a423cae554d2544a..32c6c4f8bdc2510a9fbce18be4cf64cbe21e6f10 100644 +index 243d52e75cb4f1bd5a11382f8c79db29b145dfbf..37f4f80003e2355226231265b6b7b82f7ce4d27e 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -895,7 +895,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0092-Skip-cloning-advancement-criteria.patch b/patches/server/0093-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0092-Skip-cloning-advancement-criteria.patch rename to patches/server/0093-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0093-Reduce-block-destruction-packet-allocations.patch b/patches/server/0094-Reduce-block-destruction-packet-allocations.patch similarity index 95% rename from patches/server/0093-Reduce-block-destruction-packet-allocations.patch rename to patches/server/0094-Reduce-block-destruction-packet-allocations.patch index 2e64a61..201c4e5 100644 --- a/patches/server/0093-Reduce-block-destruction-packet-allocations.patch +++ b/patches/server/0094-Reduce-block-destruction-packet-allocations.patch @@ -13,7 +13,7 @@ As part of: SportPaper (https://github.com/Electroid/SportPaper) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 5b29319f59f07c422f9df09af347e57d65c3fba0..bab835c5254d857061920a02bc7c918eb9da7436 100644 +index 186c5eb85bb0807d49f8ad35a4a08c869fc0fa90..c1100bfd6e2651185a124849833b24c76f395462 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1467,7 +1467,17 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf. diff --git a/patches/server/0094-Spread-out-sending-all-player-info.patch b/patches/server/0095-Spread-out-sending-all-player-info.patch similarity index 98% rename from patches/server/0094-Spread-out-sending-all-player-info.patch rename to patches/server/0095-Spread-out-sending-all-player-info.patch index 75d013a..4a0b8cd 100644 --- a/patches/server/0094-Spread-out-sending-all-player-info.patch +++ b/patches/server/0095-Spread-out-sending-all-player-info.patch @@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 7ebe9f2842b76c2a12d8316916d22ff17a45b3ac..6afadb847906050566f0eeb8ba5ad5c539d0c9b7 100644 +index cf834a2cc39ecd058325d2ef9eb647289648bd8e..1b5bfdd69766c6de813b0ef2fcadcaf19a468c03 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -13,6 +13,8 @@ import java.net.SocketAddress; @@ -157,7 +157,7 @@ index 7ebe9f2842b76c2a12d8316916d22ff17a45b3ac..6afadb847906050566f0eeb8ba5ad5c5 } diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index e513e17f460927fcffd029bb3b3357ca85aa514d..f136510042db4c40a486b2ee3ed7e91a90bd9424 100644 +index 839f0b57db88ab7a6d6882f1fbedc1007bc95a63..0a97b72217b3509796d23fe9fe611b8ff020748c 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -39,6 +39,7 @@ import net.minecraft.network.syncher.SynchedEntityData; diff --git a/patches/server/0095-Optimize-player-list-for-sending-player-info.patch b/patches/server/0096-Optimize-player-list-for-sending-player-info.patch similarity index 97% rename from patches/server/0095-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0096-Optimize-player-list-for-sending-player-info.patch index 4899b98..11382e1 100644 --- a/patches/server/0095-Optimize-player-list-for-sending-player-info.patch +++ b/patches/server/0096-Optimize-player-list-for-sending-player-info.patch @@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 6afadb847906050566f0eeb8ba5ad5c539d0c9b7..16718cec74f7166b00177c8a73fd4d7a30213388 100644 +index 1b5bfdd69766c6de813b0ef2fcadcaf19a468c03..a8d0e6566183f440f8e2732e10b390ba8b6ed517 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1018,14 +1018,18 @@ public abstract class PlayerList { diff --git a/patches/server/0096-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0097-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0096-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0097-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0097-Send-multiple-keep-alive-packets.patch b/patches/server/0098-Send-multiple-keep-alive-packets.patch similarity index 99% rename from patches/server/0097-Send-multiple-keep-alive-packets.patch rename to patches/server/0098-Send-multiple-keep-alive-packets.patch index c82b949..96e9d72 100644 --- a/patches/server/0097-Send-multiple-keep-alive-packets.patch +++ b/patches/server/0098-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 794d9aa6f54f9c68dc4a65c7e3d2d247d742cabc..086249f14abd7479e8444d9153394b29a8982267 100644 +index f9647ce528d23743f687249ecaa6b51cfa3e62d2..deb4282880aa5f28100a202c73514c892f487be0 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; diff --git a/patches/server/0098-Make-slow-login-timeout-configurable.patch b/patches/server/0099-Make-slow-login-timeout-configurable.patch similarity index 100% rename from patches/server/0098-Make-slow-login-timeout-configurable.patch rename to patches/server/0099-Make-slow-login-timeout-configurable.patch diff --git a/patches/server/0099-Load-portal-destination-chunk-before-entity-teleport.patch b/patches/server/0100-Load-portal-destination-chunk-before-entity-teleport.patch similarity index 100% rename from patches/server/0099-Load-portal-destination-chunk-before-entity-teleport.patch rename to patches/server/0100-Load-portal-destination-chunk-before-entity-teleport.patch diff --git a/patches/server/0100-Don-t-load-chunks-to-spawn-phantoms.patch b/patches/server/0101-Don-t-load-chunks-to-spawn-phantoms.patch similarity index 100% rename from patches/server/0100-Don-t-load-chunks-to-spawn-phantoms.patch rename to patches/server/0101-Don-t-load-chunks-to-spawn-phantoms.patch diff --git a/patches/server/0101-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0102-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 100% rename from patches/server/0101-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0102-Don-t-load-chunks-to-activate-climbing-entities.patch diff --git a/patches/server/0102-Broadcast-crit-animations-as-the-entity-being-critte.patch b/patches/server/0103-Broadcast-crit-animations-as-the-entity-being-critte.patch similarity index 100% rename from patches/server/0102-Broadcast-crit-animations-as-the-entity-being-critte.patch rename to patches/server/0103-Broadcast-crit-animations-as-the-entity-being-critte.patch diff --git a/patches/server/0103-Ignore-null-legacy-structure-data.patch b/patches/server/0104-Ignore-null-legacy-structure-data.patch similarity index 100% rename from patches/server/0103-Ignore-null-legacy-structure-data.patch rename to patches/server/0104-Ignore-null-legacy-structure-data.patch diff --git a/patches/server/0104-Skip-unnecessary-mob-spawning-computations.patch b/patches/server/0105-Skip-unnecessary-mob-spawning-computations.patch similarity index 100% rename from patches/server/0104-Skip-unnecessary-mob-spawning-computations.patch rename to patches/server/0105-Skip-unnecessary-mob-spawning-computations.patch diff --git a/patches/server/0105-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0106-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 100% rename from patches/server/0105-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to patches/server/0106-Prevent-entities-random-strolling-into-non-ticking-c.patch diff --git a/patches/server/0106-Do-not-place-player-in-world-if-kicked-before-being-.patch b/patches/server/0107-Do-not-place-player-in-world-if-kicked-before-being-.patch similarity index 94% rename from patches/server/0106-Do-not-place-player-in-world-if-kicked-before-being-.patch rename to patches/server/0107-Do-not-place-player-in-world-if-kicked-before-being-.patch index f74f341..ee3e053 100644 --- a/patches/server/0106-Do-not-place-player-in-world-if-kicked-before-being-.patch +++ b/patches/server/0107-Do-not-place-player-in-world-if-kicked-before-being-.patch @@ -14,7 +14,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/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 16718cec74f7166b00177c8a73fd4d7a30213388..90191fb36306454fa9741992967eb3d0af6dc584 100644 +index a8d0e6566183f440f8e2732e10b390ba8b6ed517..b74f809138d657bcfcaa68fc30984e591b1e908b 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -275,6 +275,13 @@ public abstract class PlayerList { diff --git a/patches/server/0107-CraftBukkit-UUID-to-world-map.patch b/patches/server/0108-CraftBukkit-UUID-to-world-map.patch similarity index 100% rename from patches/server/0107-CraftBukkit-UUID-to-world-map.patch rename to patches/server/0108-CraftBukkit-UUID-to-world-map.patch diff --git a/patches/server/0108-Global-EULA-file.patch b/patches/server/0109-Global-EULA-file.patch similarity index 100% rename from patches/server/0108-Global-EULA-file.patch rename to patches/server/0109-Global-EULA-file.patch diff --git a/patches/server/0109-Specific-interval-TPS-API.patch b/patches/server/0110-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0109-Specific-interval-TPS-API.patch rename to patches/server/0110-Specific-interval-TPS-API.patch diff --git a/patches/server/0110-5-second-TPS-average.patch b/patches/server/0111-5-second-TPS-average.patch similarity index 100% rename from patches/server/0110-5-second-TPS-average.patch rename to patches/server/0111-5-second-TPS-average.patch diff --git a/patches/server/0111-Measure-last-tick-time.patch b/patches/server/0112-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0111-Measure-last-tick-time.patch rename to patches/server/0112-Measure-last-tick-time.patch diff --git a/patches/server/0112-Last-tick-time-API.patch b/patches/server/0113-Last-tick-time-API.patch similarity index 100% rename from patches/server/0112-Last-tick-time-API.patch rename to patches/server/0113-Last-tick-time-API.patch diff --git a/patches/server/0113-Show-last-tick-time-in-tps-command.patch b/patches/server/0114-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0113-Show-last-tick-time-in-tps-command.patch rename to patches/server/0114-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0114-Increase-time-statistics-in-intervals.patch b/patches/server/0115-Increase-time-statistics-in-intervals.patch similarity index 98% rename from patches/server/0114-Increase-time-statistics-in-intervals.patch rename to patches/server/0115-Increase-time-statistics-in-intervals.patch index 75d2372..7b5fc2a 100644 --- a/patches/server/0114-Increase-time-statistics-in-intervals.patch +++ b/patches/server/0115-Increase-time-statistics-in-intervals.patch @@ -45,7 +45,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index f136510042db4c40a486b2ee3ed7e91a90bd9424..e8e2ffdb97bf9a54491733fa876365f3f4b3e9ac 100644 +index 0a97b72217b3509796d23fe9fe611b8ff020748c..b5659a5cc87859c93f8c837d9f5090f7024a3d84 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -114,6 +114,7 @@ import net.minecraft.world.phys.AABB; diff --git a/patches/server/0115-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0116-For-collision-check-has-physics-before-same-vehicle.patch similarity index 100% rename from patches/server/0115-For-collision-check-has-physics-before-same-vehicle.patch rename to patches/server/0116-For-collision-check-has-physics-before-same-vehicle.patch diff --git a/patches/server/0116-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0117-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from patches/server/0116-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0117-Skip-negligible-planar-movement-multiplication.patch diff --git a/patches/server/0117-Optimize-matching-item-checks.patch b/patches/server/0118-Optimize-matching-item-checks.patch similarity index 100% rename from patches/server/0117-Optimize-matching-item-checks.patch rename to patches/server/0118-Optimize-matching-item-checks.patch diff --git a/patches/server/0118-Pre-compute-VarLong-sizes.patch b/patches/server/0119-Pre-compute-VarLong-sizes.patch similarity index 100% rename from patches/server/0118-Pre-compute-VarLong-sizes.patch rename to patches/server/0119-Pre-compute-VarLong-sizes.patch diff --git a/patches/server/0119-Optimize-VarInt-write-and-VarLong-write.patch b/patches/server/0120-Optimize-VarInt-write-and-VarLong-write.patch similarity index 100% rename from patches/server/0119-Optimize-VarInt-write-and-VarLong-write.patch rename to patches/server/0120-Optimize-VarInt-write-and-VarLong-write.patch diff --git a/patches/server/0120-Reduce-RandomSource-instances.patch b/patches/server/0121-Reduce-RandomSource-instances.patch similarity index 99% rename from patches/server/0120-Reduce-RandomSource-instances.patch rename to patches/server/0121-Reduce-RandomSource-instances.patch index 826714c..09ac22e 100644 --- a/patches/server/0120-Reduce-RandomSource-instances.patch +++ b/patches/server/0121-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 5c0e5803284bfc82c2dd8bba9ded0ba7aac4962a..2cc37e5734233954710c4ef55bf3b2918f2026d5 100644 +index 539e17bdeefd0be17a46cb65e034c7e0e4df181c..fbc95098b45478a8da395b9816c86571959d179c 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 { diff --git a/patches/server/0121-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch b/patches/server/0122-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch similarity index 100% rename from patches/server/0121-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch rename to patches/server/0122-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch diff --git a/patches/server/0122-Initialize-line-of-sight-cache-with-low-capacity.patch b/patches/server/0123-Initialize-line-of-sight-cache-with-low-capacity.patch similarity index 100% rename from patches/server/0122-Initialize-line-of-sight-cache-with-low-capacity.patch rename to patches/server/0123-Initialize-line-of-sight-cache-with-low-capacity.patch diff --git a/patches/server/0123-Reduce-line-of-sight-updates-and-cache-lookups.patch b/patches/server/0124-Reduce-line-of-sight-updates-and-cache-lookups.patch similarity index 100% rename from patches/server/0123-Reduce-line-of-sight-updates-and-cache-lookups.patch rename to patches/server/0124-Reduce-line-of-sight-updates-and-cache-lookups.patch diff --git a/patches/server/0124-Server-thread-priority-environment-variable.patch b/patches/server/0125-Server-thread-priority-environment-variable.patch similarity index 100% rename from patches/server/0124-Server-thread-priority-environment-variable.patch rename to patches/server/0125-Server-thread-priority-environment-variable.patch diff --git a/patches/server/0125-Virtual-thread-support.patch b/patches/server/0126-Virtual-thread-support.patch similarity index 100% rename from patches/server/0125-Virtual-thread-support.patch rename to patches/server/0126-Virtual-thread-support.patch