diff --git a/leaf-server/minecraft-patches/features/0020-Reduce-entity-allocations.patch b/leaf-archived-patches/removed/hardfork/server/0020-Reduce-entity-allocations.patch similarity index 97% rename from leaf-server/minecraft-patches/features/0020-Reduce-entity-allocations.patch rename to leaf-archived-patches/removed/hardfork/server/0020-Reduce-entity-allocations.patch index c48f622a..7fe29c99 100644 --- a/leaf-server/minecraft-patches/features/0020-Reduce-entity-allocations.patch +++ b/leaf-archived-patches/removed/hardfork/server/0020-Reduce-entity-allocations.patch @@ -3,6 +3,8 @@ From: Martijn Muijsers Date: Wed, 23 Nov 2022 23:10:56 +0100 Subject: [PATCH] Reduce entity allocations +Removed since Leaf 1.21.4, replace by optimizations in Multithreaded Tracker patch + License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/leaf-archived-patches/work/server/0042-Optimize-Minecart-collisions.patch b/leaf-archived-patches/work/server/0042-Optimize-Minecart-collisions.patch new file mode 100644 index 00000000..d583555e --- /dev/null +++ b/leaf-archived-patches/work/server/0042-Optimize-Minecart-collisions.patch @@ -0,0 +1,110 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> +Date: Sat, 6 Apr 2024 22:57:41 -0400 +Subject: [PATCH] Optimize Minecart collisions + +TODO: need to re-design + +Co-authored-by: MrHua269 + +Skip tick collisions to to prevent lag causing by massive stacked Minecart +Useful for anarchy server. + +diff --git a/src/main/java/net/minecraft/world/entity/EntitySelector.java b/src/main/java/net/minecraft/world/entity/EntitySelector.java +index 4830ebddade00f62287bcc9d7b17be83c0ad3a56..fca917561944017e032ea39ffb22cbd2c89b9f51 100644 +--- a/src/main/java/net/minecraft/world/entity/EntitySelector.java ++++ b/src/main/java/net/minecraft/world/entity/EntitySelector.java +@@ -63,6 +63,13 @@ public final class EntitySelector { + } + public static Predicate pushable(Entity entity, boolean ignoreClimbing) { + // Paper end - Climbing should not bypass cramming gamerule ++ ++ // Leaf start - Optimize Minecart collisions ++ if (entity instanceof net.minecraft.world.entity.vehicle.AbstractMinecart) { ++ return x -> true; ++ } ++ // Leaf end - Optimize Minecart collisions ++ + PlayerTeam scoreboardteam = entity.getTeam(); + Team.CollisionRule scoreboardteambase_enumteampush = scoreboardteam == null ? Team.CollisionRule.ALWAYS : scoreboardteam.getCollisionRule(); + +diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java +index 8b1c00062a5272d1020bc85491d8627c4d5f46cb..ec437f625f10098c008571569abb89ad4af52781 100644 +--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java ++++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java +@@ -386,15 +386,15 @@ public abstract class AbstractMinecart extends VehicleEntity { + this.level().getCraftServer().getPluginManager().callEvent(new org.bukkit.event.vehicle.VehicleMoveEvent(vehicle, from, to)); + } + // CraftBukkit end +- if (this.getMinecartType() == AbstractMinecart.Type.RIDEABLE && this.getDeltaMovement().horizontalDistanceSqr() > 0.01D) { ++ // Leaf start - Optimize Minecart collision handling ++ // The logic below is used to get list of entities around Minecart ++ // and handle behaviors for their collisions with each other ++ if (!org.dreeam.leaf.config.modules.opt.OptimizeMinecart.enabled || this.tickCount % org.dreeam.leaf.config.modules.opt.OptimizeMinecart.skipTickCount == 0) { ++ if (this.getMinecartType() == AbstractMinecart.Type.RIDEABLE && (org.dreeam.leaf.config.modules.opt.OptimizeMinecart.enabled || this.getDeltaMovement().horizontalDistanceSqr() > 0.01D)) { + List list = this.level().getEntities((Entity) this, this.getBoundingBox().inflate(0.20000000298023224D, 0.0D, 0.20000000298023224D), EntitySelector.pushableBy(this)); + + if (!list.isEmpty()) { +- Iterator iterator = list.iterator(); +- +- while (iterator.hasNext()) { +- Entity entity = (Entity) iterator.next(); +- ++ for (Entity entity : list) { + if (!(entity instanceof Player) && !(entity instanceof IronGolem) && !(entity instanceof AbstractMinecart) && !this.isVehicle() && !entity.isPassenger()) { + // CraftBukkit start + VehicleEntityCollisionEvent collisionEvent = new VehicleEntityCollisionEvent(vehicle, entity.getBukkitEntity()); +@@ -421,11 +421,7 @@ public abstract class AbstractMinecart extends VehicleEntity { + } + } + } else { +- Iterator iterator1 = this.level().getEntities(this, this.getBoundingBox().inflate(0.20000000298023224D, 0.0D, 0.20000000298023224D)).iterator(); +- +- while (iterator1.hasNext()) { +- Entity entity1 = (Entity) iterator1.next(); +- ++ for (Entity entity1 : this.level().getEntities(this, this.getBoundingBox().inflate(0.20000000298023224D, 0.0D, 0.20000000298023224D))) { + if (!this.hasPassenger(entity1) && entity1.isPushable() && entity1 instanceof AbstractMinecart) { + // CraftBukkit start + VehicleEntityCollisionEvent collisionEvent = new VehicleEntityCollisionEvent(vehicle, entity1.getBukkitEntity()); +@@ -439,6 +435,8 @@ public abstract class AbstractMinecart extends VehicleEntity { + } + } + } ++ } ++ // Leaf end + + this.updateInWaterStateAndDoFluidPushing(); + if (this.isInLava()) { +diff --git a/src/main/java/org/dreeam/leaf/config/modules/opt/OptimizeMinecart.java b/src/main/java/org/dreeam/leaf/config/modules/opt/OptimizeMinecart.java +new file mode 100644 +index 0000000000000000000000000000000000000000..8ca03c5abfb9e11dfbb6e65453052780e289c686 +--- /dev/null ++++ b/src/main/java/org/dreeam/leaf/config/modules/opt/OptimizeMinecart.java +@@ -0,0 +1,26 @@ ++package org.dreeam.leaf.config.modules.opt; ++ ++import org.dreeam.leaf.config.ConfigModules; ++import org.dreeam.leaf.config.EnumConfigCategory; ++ ++public class OptimizeMinecart extends ConfigModules { ++ ++ public String getBasePath() { ++ return EnumConfigCategory.PERF.getBaseKeyName() + ".optimize-minecart"; ++ } ++ ++ public static boolean enabled = false; ++ public static int skipTickCount = 30; ++ ++ @Override ++ public void onLoaded() { ++ enabled = config.getBoolean(getBasePath() + ".enabled", enabled, config.pickStringRegionBased(""" ++ Enable this feature to handle a large amount of stacked minecarts better. ++ By skipping tick collisions to reduce expensive getEntities ++ and bukkit event calls, useful for anarchy servers. ++ """, ++ """ ++ 开启此项可更好地承受大量堆叠矿车. (通过跳过碰撞 tick 的方式)""")); ++ skipTickCount = config.getInt(getBasePath() + ".skip-tick-count", skipTickCount); ++ } ++} diff --git a/leaf-server/minecraft-patches/features/0021-Remove-lambda-from-ticking-guard.patch b/leaf-server/minecraft-patches/features/0020-Remove-lambda-from-ticking-guard.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0021-Remove-lambda-from-ticking-guard.patch rename to leaf-server/minecraft-patches/features/0020-Remove-lambda-from-ticking-guard.patch index 798a86f7..8a863b8b 100644 --- a/leaf-server/minecraft-patches/features/0021-Remove-lambda-from-ticking-guard.patch +++ b/leaf-server/minecraft-patches/features/0020-Remove-lambda-from-ticking-guard.patch @@ -31,7 +31,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index 06439db58ecec0ead6c0a4e30357a9a3b3ebd120..3cb0407c022c0b3e8627fc1d9736d3eee0609039 100644 +index 606dee544c669dcaa0eb02808c5786545b5519eb..f14aab66d200828952b647fa8424caec757a9e9c 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -784,7 +784,19 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe @@ -56,7 +56,7 @@ index 06439db58ecec0ead6c0a4e30357a9a3b3ebd120..3cb0407c022c0b3e8627fc1d9736d3ee } } diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java -index 013e22dc4eceda9b947f1ff8fe43540b8855aa34..20403c3e2582caf3541cd9b051fb5ebff52eb555 100644 +index a2513f58d6a19aef1f43fb120f6d78e53a3b129b..9e72ed6ed0c5acb69f23652dce473e914455c412 100644 --- a/net/minecraft/world/level/Level.java +++ b/net/minecraft/world/level/Level.java @@ -1489,10 +1489,10 @@ public abstract class Level implements LevelAccessor, UUIDLookup, AutoCl diff --git a/leaf-server/minecraft-patches/features/0022-SIMD-support.patch b/leaf-server/minecraft-patches/features/0021-SIMD-support.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0022-SIMD-support.patch rename to leaf-server/minecraft-patches/features/0021-SIMD-support.patch diff --git a/leaf-server/minecraft-patches/features/0023-Make-book-writing-configurable.patch b/leaf-server/minecraft-patches/features/0022-Make-book-writing-configurable.patch similarity index 95% rename from leaf-server/minecraft-patches/features/0023-Make-book-writing-configurable.patch rename to leaf-server/minecraft-patches/features/0022-Make-book-writing-configurable.patch index 5fd1ca2d..7c711e3d 100644 --- a/leaf-server/minecraft-patches/features/0023-Make-book-writing-configurable.patch +++ b/leaf-server/minecraft-patches/features/0022-Make-book-writing-configurable.patch @@ -22,7 +22,7 @@ you to easily disable books, should you want to preemptively remove this functionality before additional exploits are found. diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 064a9b6cf6792192fc1fa80095a48c2025cebf2a..7576932c6ccb0e018ad19ef6cf4f5d217de6bda4 100644 +index 9041830c19e2899479e1519488faba5c416ccd88..3c5b1cf6d47738d232282abe7f7f24c40b7bb387 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1225,6 +1225,11 @@ public class ServerGamePacketListenerImpl diff --git a/leaf-server/minecraft-patches/features/0024-Reduce-in-wall-checks.patch b/leaf-server/minecraft-patches/features/0023-Reduce-in-wall-checks.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0024-Reduce-in-wall-checks.patch rename to leaf-server/minecraft-patches/features/0023-Reduce-in-wall-checks.patch index a18e9990..895a2ca0 100644 --- a/leaf-server/minecraft-patches/features/0024-Reduce-in-wall-checks.patch +++ b/leaf-server/minecraft-patches/features/0023-Reduce-in-wall-checks.patch @@ -28,7 +28,7 @@ but is so much cheaper than the suffocation check that it's worth keeping it. diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index bb687f048be9edfde75d13354dd3265593e83e9f..ac86ea5fc03aab1445712a7143f7714eea31b124 100644 +index f019571b4b6b5e2d1953030911449a02e459591c..85759f8fe3892e0af3cbbd836defc9ee4b2705f6 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -419,7 +419,10 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/leaf-server/minecraft-patches/features/0025-Make-chat-order-verification-configurable.patch b/leaf-server/minecraft-patches/features/0024-Make-chat-order-verification-configurable.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0025-Make-chat-order-verification-configurable.patch rename to leaf-server/minecraft-patches/features/0024-Make-chat-order-verification-configurable.patch diff --git a/leaf-server/minecraft-patches/features/0026-Make-ender-dragon-respawn-attempt-after-placing-end-.patch b/leaf-server/minecraft-patches/features/0025-Make-ender-dragon-respawn-attempt-after-placing-end-.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0026-Make-ender-dragon-respawn-attempt-after-placing-end-.patch rename to leaf-server/minecraft-patches/features/0025-Make-ender-dragon-respawn-attempt-after-placing-end-.patch diff --git a/leaf-server/minecraft-patches/features/0027-Make-saving-fireworks-configurable.patch b/leaf-server/minecraft-patches/features/0026-Make-saving-fireworks-configurable.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0027-Make-saving-fireworks-configurable.patch rename to leaf-server/minecraft-patches/features/0026-Make-saving-fireworks-configurable.patch diff --git a/leaf-server/minecraft-patches/features/0028-Reduce-hopper-item-checks.patch b/leaf-server/minecraft-patches/features/0027-Reduce-hopper-item-checks.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0028-Reduce-hopper-item-checks.patch rename to leaf-server/minecraft-patches/features/0027-Reduce-hopper-item-checks.patch diff --git a/leaf-server/minecraft-patches/features/0029-Reduce-villager-item-re-pickup.patch b/leaf-server/minecraft-patches/features/0028-Reduce-villager-item-re-pickup.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0029-Reduce-villager-item-re-pickup.patch rename to leaf-server/minecraft-patches/features/0028-Reduce-villager-item-re-pickup.patch diff --git a/leaf-server/minecraft-patches/features/0030-Variable-entity-wake-up-duration.patch b/leaf-server/minecraft-patches/features/0029-Variable-entity-wake-up-duration.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0030-Variable-entity-wake-up-duration.patch rename to leaf-server/minecraft-patches/features/0029-Variable-entity-wake-up-duration.patch diff --git a/leaf-server/minecraft-patches/features/0031-Do-not-process-chat-commands-before-player-has-joine.patch b/leaf-server/minecraft-patches/features/0030-Do-not-process-chat-commands-before-player-has-joine.patch similarity index 94% rename from leaf-server/minecraft-patches/features/0031-Do-not-process-chat-commands-before-player-has-joine.patch rename to leaf-server/minecraft-patches/features/0030-Do-not-process-chat-commands-before-player-has-joine.patch index 0f17ed22..6c4203db 100644 --- a/leaf-server/minecraft-patches/features/0031-Do-not-process-chat-commands-before-player-has-joine.patch +++ b/leaf-server/minecraft-patches/features/0030-Do-not-process-chat-commands-before-player-has-joine.patch @@ -13,7 +13,7 @@ As part of: EmpireCraft (https://github.com/starlis/empirecraft) Licensed under: MIT (https://opensource.org/licenses/MIT) diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index eb61b2c6323d2b3dad8939e73d7b95450c09ef6c..c2f16ad046a24a1d6fba9f91d832a870e904457d 100644 +index 6f60f5e92628e744a22b3d3f83c2010d8a4661be..6d1542dc07fdf1f3384e8e6d1dacca5f8c3f0b69 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -414,6 +414,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc @@ -25,7 +25,7 @@ index eb61b2c6323d2b3dad8939e73d7b95450c09ef6c..c2f16ad046a24a1d6fba9f91d832a870 public @Nullable com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent public @Nullable String clientBrandName = null; // Paper - Brand support diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7576932c6ccb0e018ad19ef6cf4f5d217de6bda4..debeec0ff3bfb9f9d84ce0607365a05802b6496b 100644 +index 3c5b1cf6d47738d232282abe7f7f24c40b7bb387..99670d9b8450f8c5a04927a18720468d4ddc1bec 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2399,7 +2399,7 @@ public class ServerGamePacketListenerImpl diff --git a/leaf-server/minecraft-patches/features/0032-Do-not-log-invalid-statistics.patch b/leaf-server/minecraft-patches/features/0031-Do-not-log-invalid-statistics.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0032-Do-not-log-invalid-statistics.patch rename to leaf-server/minecraft-patches/features/0031-Do-not-log-invalid-statistics.patch diff --git a/leaf-server/minecraft-patches/features/0033-Do-not-log-empty-message-warnings.patch b/leaf-server/minecraft-patches/features/0032-Do-not-log-empty-message-warnings.patch similarity index 93% rename from leaf-server/minecraft-patches/features/0033-Do-not-log-empty-message-warnings.patch rename to leaf-server/minecraft-patches/features/0032-Do-not-log-empty-message-warnings.patch index 7a07e2ed..ae1a99da 100644 --- a/leaf-server/minecraft-patches/features/0033-Do-not-log-empty-message-warnings.patch +++ b/leaf-server/minecraft-patches/features/0032-Do-not-log-empty-message-warnings.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/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index debeec0ff3bfb9f9d84ce0607365a05802b6496b..421665c29e55c1b1a732e38e4b41577a82d901e5 100644 +index 99670d9b8450f8c5a04927a18720468d4ddc1bec..c06d9ae722455cd2315097b2b0333d2adb51f9ad 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2481,7 +2481,7 @@ public class ServerGamePacketListenerImpl diff --git a/leaf-server/minecraft-patches/features/0034-Do-not-log-ignored-advancements.patch b/leaf-server/minecraft-patches/features/0033-Do-not-log-ignored-advancements.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0034-Do-not-log-ignored-advancements.patch rename to leaf-server/minecraft-patches/features/0033-Do-not-log-ignored-advancements.patch diff --git a/leaf-server/minecraft-patches/features/0035-Do-not-log-setBlock-in-far-chunks.patch b/leaf-server/minecraft-patches/features/0034-Do-not-log-setBlock-in-far-chunks.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0035-Do-not-log-setBlock-in-far-chunks.patch rename to leaf-server/minecraft-patches/features/0034-Do-not-log-setBlock-in-far-chunks.patch diff --git a/leaf-server/minecraft-patches/features/0036-Do-not-log-unrecognized-recipes.patch b/leaf-server/minecraft-patches/features/0035-Do-not-log-unrecognized-recipes.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0036-Do-not-log-unrecognized-recipes.patch rename to leaf-server/minecraft-patches/features/0035-Do-not-log-unrecognized-recipes.patch diff --git a/leaf-server/minecraft-patches/features/0037-Do-not-log-expired-message-warnings.patch b/leaf-server/minecraft-patches/features/0036-Do-not-log-expired-message-warnings.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0037-Do-not-log-expired-message-warnings.patch rename to leaf-server/minecraft-patches/features/0036-Do-not-log-expired-message-warnings.patch diff --git a/leaf-server/minecraft-patches/features/0038-Do-not-log-Not-Secure-marker.patch b/leaf-server/minecraft-patches/features/0037-Do-not-log-Not-Secure-marker.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0038-Do-not-log-Not-Secure-marker.patch rename to leaf-server/minecraft-patches/features/0037-Do-not-log-Not-Secure-marker.patch diff --git a/leaf-server/minecraft-patches/features/0039-Do-not-log-disconnections-with-null-id.patch b/leaf-server/minecraft-patches/features/0038-Do-not-log-disconnections-with-null-id.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0039-Do-not-log-disconnections-with-null-id.patch rename to leaf-server/minecraft-patches/features/0038-Do-not-log-disconnections-with-null-id.patch diff --git a/leaf-server/minecraft-patches/features/0040-Do-not-log-run-as-root-warning.patch b/leaf-server/minecraft-patches/features/0039-Do-not-log-run-as-root-warning.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0040-Do-not-log-run-as-root-warning.patch rename to leaf-server/minecraft-patches/features/0039-Do-not-log-run-as-root-warning.patch diff --git a/leaf-server/minecraft-patches/features/0041-Do-not-log-offline-mode-warning.patch b/leaf-server/minecraft-patches/features/0040-Do-not-log-offline-mode-warning.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0041-Do-not-log-offline-mode-warning.patch rename to leaf-server/minecraft-patches/features/0040-Do-not-log-offline-mode-warning.patch diff --git a/leaf-server/minecraft-patches/features/0042-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/leaf-server/minecraft-patches/features/0041-Fix-outdated-server-showing-in-ping-before-server-fu.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0042-Fix-outdated-server-showing-in-ping-before-server-fu.patch rename to leaf-server/minecraft-patches/features/0041-Fix-outdated-server-showing-in-ping-before-server-fu.patch diff --git a/leaf-server/minecraft-patches/features/0043-Fix-MC-238526.patch b/leaf-server/minecraft-patches/features/0042-Fix-MC-238526.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0043-Fix-MC-238526.patch rename to leaf-server/minecraft-patches/features/0042-Fix-MC-238526.patch diff --git a/leaf-server/minecraft-patches/features/0044-Fix-MC-121706.patch b/leaf-server/minecraft-patches/features/0043-Fix-MC-121706.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0044-Fix-MC-121706.patch rename to leaf-server/minecraft-patches/features/0043-Fix-MC-121706.patch diff --git a/leaf-server/minecraft-patches/features/0045-Make-arrow-movement-resetting-despawn-counter-config.patch b/leaf-server/minecraft-patches/features/0044-Make-arrow-movement-resetting-despawn-counter-config.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0045-Make-arrow-movement-resetting-despawn-counter-config.patch rename to leaf-server/minecraft-patches/features/0044-Make-arrow-movement-resetting-despawn-counter-config.patch diff --git a/leaf-server/minecraft-patches/features/0046-Make-logging-login-locations-configurable.patch b/leaf-server/minecraft-patches/features/0045-Make-logging-login-locations-configurable.patch similarity index 95% rename from leaf-server/minecraft-patches/features/0046-Make-logging-login-locations-configurable.patch rename to leaf-server/minecraft-patches/features/0045-Make-logging-login-locations-configurable.patch index c88e0630..7bd5bede 100644 --- a/leaf-server/minecraft-patches/features/0046-Make-logging-login-locations-configurable.patch +++ b/leaf-server/minecraft-patches/features/0045-Make-logging-login-locations-configurable.patch @@ -13,7 +13,7 @@ As part of: JettPack (https://gitlab.com/Titaniumtown/JettPack) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java -index 29904ffc7aa1b60ceb94cd2e4f7c86d26e398e6c..2bfff6cc34bc94402fb349d2641efadf380c241a 100644 +index 2a4e52ba074dfd6dce98669282de729eae7d272a..be324f5085c1cceb3d4c37bc73d0ee5ac761a99c 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java @@ -402,7 +402,13 @@ public abstract class PlayerList { diff --git a/leaf-server/minecraft-patches/features/0047-Reduce-array-allocations.patch b/leaf-server/minecraft-patches/features/0046-Reduce-array-allocations.patch similarity index 98% rename from leaf-server/minecraft-patches/features/0047-Reduce-array-allocations.patch rename to leaf-server/minecraft-patches/features/0046-Reduce-array-allocations.patch index 5a2acf02..180ecf90 100644 --- a/leaf-server/minecraft-patches/features/0047-Reduce-array-allocations.patch +++ b/leaf-server/minecraft-patches/features/0046-Reduce-array-allocations.patch @@ -126,7 +126,7 @@ index 8ef16f98996b1ec0c9c3f158248ac95f1b07328f..6780b2493d625603b74e635c4996bb83 private static final Codec ARG_CODEC = Codec.either(PRIMITIVE_ARG_CODEC, ComponentSerialization.CODEC) .xmap( diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index b127f444b79ef9430121045f328dd77b6b8182b2..3d476a93ecf3b12012db92ef07c0a899aac93388 100644 +index f14aab66d200828952b647fa8424caec757a9e9c..4da7c02024a5ad8ba34bad2adfd8228f11f39eee 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -1220,7 +1220,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe @@ -139,7 +139,7 @@ index b127f444b79ef9430121045f328dd77b6b8182b2..3d476a93ecf3b12012db92ef07c0a899 return ret; } diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 421665c29e55c1b1a732e38e4b41577a82d901e5..c6f52c899a3e4baf483412af8315d72a29f7139a 100644 +index c06d9ae722455cd2315097b2b0333d2adb51f9ad..68368928035ffa8fb7b12a7e3c6a7f9686379933 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2771,7 +2771,7 @@ public class ServerGamePacketListenerImpl @@ -236,7 +236,7 @@ index bfda76974ea8d4397e2c2ebf5bdcb5d7e5f0bab5..cabbc93409ca99180d115e2f23419ee1 String[] strings = new String[pattern.size() - i3 - i2]; diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java -index 20403c3e2582caf3541cd9b051fb5ebff52eb555..96f29ce52dfbaebdaff287e4ae249f6628b22cf7 100644 +index 9e72ed6ed0c5acb69f23652dce473e914455c412..439b8619e9f0ed3dc1974ba2ee6214b63447ea96 100644 --- a/net/minecraft/world/level/Level.java +++ b/net/minecraft/world/level/Level.java @@ -1832,7 +1832,7 @@ public abstract class Level implements LevelAccessor, UUIDLookup, AutoCl diff --git a/leaf-server/minecraft-patches/features/0048-Optimize-sun-burn-tick.patch b/leaf-server/minecraft-patches/features/0047-Optimize-sun-burn-tick.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0048-Optimize-sun-burn-tick.patch rename to leaf-server/minecraft-patches/features/0047-Optimize-sun-burn-tick.patch diff --git a/leaf-server/minecraft-patches/features/0049-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/leaf-server/minecraft-patches/features/0048-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0049-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to leaf-server/minecraft-patches/features/0048-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/leaf-server/minecraft-patches/features/0050-Replace-game-rules-map-with-optimized-collection.patch b/leaf-server/minecraft-patches/features/0049-Replace-game-rules-map-with-optimized-collection.patch similarity index 92% rename from leaf-server/minecraft-patches/features/0050-Replace-game-rules-map-with-optimized-collection.patch rename to leaf-server/minecraft-patches/features/0049-Replace-game-rules-map-with-optimized-collection.patch index 49d912b3..fd79f95c 100644 --- a/leaf-server/minecraft-patches/features/0050-Replace-game-rules-map-with-optimized-collection.patch +++ b/leaf-server/minecraft-patches/features/0049-Replace-game-rules-map-with-optimized-collection.patch @@ -13,7 +13,7 @@ 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/net/minecraft/world/level/GameRules.java b/net/minecraft/world/level/GameRules.java -index ea9ac158fcb98b90dfda997e3a1dfa34455f34a1..bceb900e2ceeb46faebc9925a5dc5275ac16d31c 100644 +index 02bc5d83b92a594ec519f0a02b0517fdb4b9e954..a3a2d51cf53ce4dba8caaaf73967ae714ed16a36 100644 --- a/net/minecraft/world/level/GameRules.java +++ b/net/minecraft/world/level/GameRules.java @@ -277,7 +277,7 @@ public class GameRules { diff --git a/leaf-server/minecraft-patches/features/0051-Replace-AI-attributes-with-optimized-collections.patch b/leaf-server/minecraft-patches/features/0050-Replace-AI-attributes-with-optimized-collections.patch similarity index 88% rename from leaf-server/minecraft-patches/features/0051-Replace-AI-attributes-with-optimized-collections.patch rename to leaf-server/minecraft-patches/features/0050-Replace-AI-attributes-with-optimized-collections.patch index 9905a094..c2c4cae2 100644 --- a/leaf-server/minecraft-patches/features/0051-Replace-AI-attributes-with-optimized-collections.patch +++ b/leaf-server/minecraft-patches/features/0050-Replace-AI-attributes-with-optimized-collections.patch @@ -13,7 +13,7 @@ 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/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/net/minecraft/world/entity/ai/attributes/AttributeMap.java -index 5b22ad7d56754f82ce8448382ab6bafc2055f413..93a079df455e371a0ca7ada253dc8b7e16b0146f 100644 +index bed9b564c493cd84bf53fc49368fda736f3fbc2b..c61071e0019a18eb73223ed9b64619c9cb691896 100644 --- a/net/minecraft/world/entity/ai/attributes/AttributeMap.java +++ b/net/minecraft/world/entity/ai/attributes/AttributeMap.java @@ -14,9 +14,11 @@ import net.minecraft.nbt.ListTag; @@ -29,5 +29,5 @@ index 5b22ad7d56754f82ce8448382ab6bafc2055f413..93a079df455e371a0ca7ada253dc8b7e + private final Set attributesToUpdate = new it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet<>(0); + // Gale end - Lithium - replace AI attributes with optimized collections private final AttributeSupplier supplier; - private final java.util.function.Function, AttributeInstance> createInstance; // Gale - Airplane - reduce entity allocations + public AttributeMap(AttributeSupplier supplier) { diff --git a/leaf-server/minecraft-patches/features/0052-Replace-class-map-with-optimized-collection.patch b/leaf-server/minecraft-patches/features/0051-Replace-class-map-with-optimized-collection.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0052-Replace-class-map-with-optimized-collection.patch rename to leaf-server/minecraft-patches/features/0051-Replace-class-map-with-optimized-collection.patch diff --git a/leaf-server/minecraft-patches/features/0053-Replace-instance-list-with-optimized-collection.patch b/leaf-server/minecraft-patches/features/0052-Replace-instance-list-with-optimized-collection.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0053-Replace-instance-list-with-optimized-collection.patch rename to leaf-server/minecraft-patches/features/0052-Replace-instance-list-with-optimized-collection.patch diff --git a/leaf-server/minecraft-patches/features/0054-Replace-throttle-tracker-map-with-optimized-collecti.patch b/leaf-server/minecraft-patches/features/0053-Replace-throttle-tracker-map-with-optimized-collecti.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0054-Replace-throttle-tracker-map-with-optimized-collecti.patch rename to leaf-server/minecraft-patches/features/0053-Replace-throttle-tracker-map-with-optimized-collecti.patch diff --git a/leaf-server/minecraft-patches/features/0055-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/leaf-server/minecraft-patches/features/0054-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0055-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to leaf-server/minecraft-patches/features/0054-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/leaf-server/minecraft-patches/features/0056-Cache-BlockStatePairKey-hash.patch b/leaf-server/minecraft-patches/features/0055-Cache-BlockStatePairKey-hash.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0056-Cache-BlockStatePairKey-hash.patch rename to leaf-server/minecraft-patches/features/0055-Cache-BlockStatePairKey-hash.patch diff --git a/leaf-server/minecraft-patches/features/0057-Cache-ShapePairKey-hash.patch b/leaf-server/minecraft-patches/features/0056-Cache-ShapePairKey-hash.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0057-Cache-ShapePairKey-hash.patch rename to leaf-server/minecraft-patches/features/0056-Cache-ShapePairKey-hash.patch diff --git a/leaf-server/minecraft-patches/features/0058-Replace-division-by-multiplication-in-CubePointRange.patch b/leaf-server/minecraft-patches/features/0057-Replace-division-by-multiplication-in-CubePointRange.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0058-Replace-division-by-multiplication-in-CubePointRange.patch rename to leaf-server/minecraft-patches/features/0057-Replace-division-by-multiplication-in-CubePointRange.patch diff --git a/leaf-server/minecraft-patches/features/0059-Replace-parts-by-size-in-CubePointRange.patch b/leaf-server/minecraft-patches/features/0058-Replace-parts-by-size-in-CubePointRange.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0059-Replace-parts-by-size-in-CubePointRange.patch rename to leaf-server/minecraft-patches/features/0058-Replace-parts-by-size-in-CubePointRange.patch diff --git a/leaf-server/minecraft-patches/features/0060-Check-frozen-ticks-before-landing-block.patch b/leaf-server/minecraft-patches/features/0059-Check-frozen-ticks-before-landing-block.patch similarity index 95% rename from leaf-server/minecraft-patches/features/0060-Check-frozen-ticks-before-landing-block.patch rename to leaf-server/minecraft-patches/features/0059-Check-frozen-ticks-before-landing-block.patch index 902a1b5e..b695ab4c 100644 --- a/leaf-server/minecraft-patches/features/0060-Check-frozen-ticks-before-landing-block.patch +++ b/leaf-server/minecraft-patches/features/0059-Check-frozen-ticks-before-landing-block.patch @@ -13,7 +13,7 @@ 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/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index ac86ea5fc03aab1445712a7143f7714eea31b124..6e93836570859929e4f35d23d9dbcc2ebbc8fb27 100644 +index 85759f8fe3892e0af3cbbd836defc9ee4b2705f6..a542e1dfa41ec2ea1a979dc27d0155d5c08fd7cc 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -521,10 +521,9 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/leaf-server/minecraft-patches/features/0061-Faster-chunk-serialization.patch b/leaf-server/minecraft-patches/features/0060-Faster-chunk-serialization.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0061-Faster-chunk-serialization.patch rename to leaf-server/minecraft-patches/features/0060-Faster-chunk-serialization.patch index f6cfe2d3..99bab90a 100644 --- a/leaf-server/minecraft-patches/features/0061-Faster-chunk-serialization.patch +++ b/leaf-server/minecraft-patches/features/0060-Faster-chunk-serialization.patch @@ -88,7 +88,7 @@ index 5c1103ef028e5ffe6ce0eadc861dd3b2c8f3ed9f..828ced8aa5665c6f5d0b121947719c4e + @Override public void compact(net.minecraft.world.level.chunk.Palette srcPalette, net.minecraft.world.level.chunk.Palette dstPalette, short[] out) {} // Gale - Lithium - faster chunk serialization } diff --git a/net/minecraft/world/level/chunk/PalettedContainer.java b/net/minecraft/world/level/chunk/PalettedContainer.java -index 95b5249fbd7e255a115403c3fbe88d402444b3cb..9dcbc18634302916abe8fe3ecd035b9c7966ec7f 100644 +index 7da7ce0fd19896593e63edc88b492c02f926bba0..f6bb9bd4d000958610ec3e6733b54c5f7a020da5 100644 --- a/net/minecraft/world/level/chunk/PalettedContainer.java +++ b/net/minecraft/world/level/chunk/PalettedContainer.java @@ -25,6 +25,22 @@ import net.minecraft.util.ThreadingDetector; diff --git a/leaf-server/minecraft-patches/features/0062-Update-boss-bar-within-tick.patch b/leaf-server/minecraft-patches/features/0061-Update-boss-bar-within-tick.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0062-Update-boss-bar-within-tick.patch rename to leaf-server/minecraft-patches/features/0061-Update-boss-bar-within-tick.patch diff --git a/leaf-server/minecraft-patches/features/0063-Skip-secondary-POI-sensor-if-absent.patch b/leaf-server/minecraft-patches/features/0062-Skip-secondary-POI-sensor-if-absent.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0063-Skip-secondary-POI-sensor-if-absent.patch rename to leaf-server/minecraft-patches/features/0062-Skip-secondary-POI-sensor-if-absent.patch diff --git a/leaf-server/minecraft-patches/features/0064-Skip-entity-move-if-movement-is-zero.patch b/leaf-server/minecraft-patches/features/0063-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0064-Skip-entity-move-if-movement-is-zero.patch rename to leaf-server/minecraft-patches/features/0063-Skip-entity-move-if-movement-is-zero.patch diff --git a/leaf-server/minecraft-patches/features/0065-Store-mob-counts-in-an-array.patch b/leaf-server/minecraft-patches/features/0064-Store-mob-counts-in-an-array.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0065-Store-mob-counts-in-an-array.patch rename to leaf-server/minecraft-patches/features/0064-Store-mob-counts-in-an-array.patch diff --git a/leaf-server/minecraft-patches/features/0066-Use-linked-map-for-entity-trackers.patch b/leaf-server/minecraft-patches/features/0065-Use-linked-map-for-entity-trackers.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0066-Use-linked-map-for-entity-trackers.patch rename to leaf-server/minecraft-patches/features/0065-Use-linked-map-for-entity-trackers.patch diff --git a/leaf-server/minecraft-patches/features/0067-Optimize-noise-generation.patch b/leaf-server/minecraft-patches/features/0066-Optimize-noise-generation.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0067-Optimize-noise-generation.patch rename to leaf-server/minecraft-patches/features/0066-Optimize-noise-generation.patch diff --git a/leaf-server/minecraft-patches/features/0068-Optimize-sheep-offspring-color.patch b/leaf-server/minecraft-patches/features/0067-Optimize-sheep-offspring-color.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0068-Optimize-sheep-offspring-color.patch rename to leaf-server/minecraft-patches/features/0067-Optimize-sheep-offspring-color.patch diff --git a/leaf-server/minecraft-patches/features/0069-Hide-flames-on-entities-with-fire-resistance.patch b/leaf-server/minecraft-patches/features/0068-Hide-flames-on-entities-with-fire-resistance.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0069-Hide-flames-on-entities-with-fire-resistance.patch rename to leaf-server/minecraft-patches/features/0068-Hide-flames-on-entities-with-fire-resistance.patch diff --git a/leaf-server/minecraft-patches/features/0070-Skip-cloning-advancement-criteria.patch b/leaf-server/minecraft-patches/features/0069-Skip-cloning-advancement-criteria.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0070-Skip-cloning-advancement-criteria.patch rename to leaf-server/minecraft-patches/features/0069-Skip-cloning-advancement-criteria.patch diff --git a/leaf-server/minecraft-patches/features/0071-Reduce-block-destruction-packet-allocations.patch b/leaf-server/minecraft-patches/features/0070-Reduce-block-destruction-packet-allocations.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0071-Reduce-block-destruction-packet-allocations.patch rename to leaf-server/minecraft-patches/features/0070-Reduce-block-destruction-packet-allocations.patch index a11e051b..bdbbd494 100644 --- a/leaf-server/minecraft-patches/features/0071-Reduce-block-destruction-packet-allocations.patch +++ b/leaf-server/minecraft-patches/features/0070-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/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index 609b3020e5c044c51d80680bb0e9f3caae5b8285..7c7be7c533fe9d2047e7695859849f7f016c7929 100644 +index 4da7c02024a5ad8ba34bad2adfd8228f11f39eee..d99ac6eb59e10ff6af841c4496ee46fbfbf57c22 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -1557,6 +1557,15 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe diff --git a/leaf-server/minecraft-patches/features/0072-Spread-out-sending-all-player-info.patch b/leaf-server/minecraft-patches/features/0071-Spread-out-sending-all-player-info.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0072-Spread-out-sending-all-player-info.patch rename to leaf-server/minecraft-patches/features/0071-Spread-out-sending-all-player-info.patch diff --git a/leaf-server/minecraft-patches/features/0073-Optimize-player-list-for-sending-player-info.patch b/leaf-server/minecraft-patches/features/0072-Optimize-player-list-for-sending-player-info.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0073-Optimize-player-list-for-sending-player-info.patch rename to leaf-server/minecraft-patches/features/0072-Optimize-player-list-for-sending-player-info.patch diff --git a/leaf-server/minecraft-patches/features/0074-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/leaf-server/minecraft-patches/features/0073-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0074-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to leaf-server/minecraft-patches/features/0073-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch index e4a2c3e7..c9f8a4a5 100644 --- a/leaf-server/minecraft-patches/features/0074-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch +++ b/leaf-server/minecraft-patches/features/0073-Skip-PlayerCommandSendEvent-if-there-are-no-listener.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/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java -index 2c20ffe36ebba53e9cb2ffc79bb25e8fb3bae207..287edc8caecfd1ebb399d52789161f4d57d0801c 100644 +index f1a637272a8e4ec9c46209ca6b58a4905c925a86..006b5502eda66909a971278aa5751ec187bb8a3c 100644 --- a/net/minecraft/commands/Commands.java +++ b/net/minecraft/commands/Commands.java @@ -496,6 +496,7 @@ public class Commands { diff --git a/leaf-server/minecraft-patches/features/0075-Send-multiple-keep-alive-packets.patch b/leaf-server/minecraft-patches/features/0074-Send-multiple-keep-alive-packets.patch similarity index 98% rename from leaf-server/minecraft-patches/features/0075-Send-multiple-keep-alive-packets.patch rename to leaf-server/minecraft-patches/features/0074-Send-multiple-keep-alive-packets.patch index e9ee5113..fe676a4b 100644 --- a/leaf-server/minecraft-patches/features/0075-Send-multiple-keep-alive-packets.patch +++ b/leaf-server/minecraft-patches/features/0074-Send-multiple-keep-alive-packets.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/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index 976525a885cf6422f8a40e92d594eef312c159bd..8c3255661221f8afbccb661bec3afb47e4059403 100644 +index 776ff13b399fa01bf3900280cf1b5782370732a0..c4f4c21f32e2aba79e15315d73124c803bb1223a 100644 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java @@ -40,6 +40,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack diff --git a/leaf-server/minecraft-patches/features/0076-Make-slow-login-timeout-configurable.patch b/leaf-server/minecraft-patches/features/0075-Make-slow-login-timeout-configurable.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0076-Make-slow-login-timeout-configurable.patch rename to leaf-server/minecraft-patches/features/0075-Make-slow-login-timeout-configurable.patch diff --git a/leaf-server/minecraft-patches/features/0077-Don-t-load-chunks-to-spawn-phantoms.patch b/leaf-server/minecraft-patches/features/0076-Don-t-load-chunks-to-spawn-phantoms.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0077-Don-t-load-chunks-to-spawn-phantoms.patch rename to leaf-server/minecraft-patches/features/0076-Don-t-load-chunks-to-spawn-phantoms.patch diff --git a/leaf-server/minecraft-patches/features/0078-Don-t-load-chunks-to-activate-climbing-entities.patch b/leaf-server/minecraft-patches/features/0077-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0078-Don-t-load-chunks-to-activate-climbing-entities.patch rename to leaf-server/minecraft-patches/features/0077-Don-t-load-chunks-to-activate-climbing-entities.patch diff --git a/leaf-server/minecraft-patches/features/0079-Broadcast-crit-animations-as-the-entity-being-critte.patch b/leaf-server/minecraft-patches/features/0078-Broadcast-crit-animations-as-the-entity-being-critte.patch similarity index 95% rename from leaf-server/minecraft-patches/features/0079-Broadcast-crit-animations-as-the-entity-being-critte.patch rename to leaf-server/minecraft-patches/features/0078-Broadcast-crit-animations-as-the-entity-being-critte.patch index 93035c15..e40061fd 100644 --- a/leaf-server/minecraft-patches/features/0079-Broadcast-crit-animations-as-the-entity-being-critte.patch +++ b/leaf-server/minecraft-patches/features/0078-Broadcast-crit-animations-as-the-entity-being-critte.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/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index c2f16ad046a24a1d6fba9f91d832a870e904457d..f1fb5a87844ca7fb1de6afc532e7e0b058e6f580 100644 +index 6d1542dc07fdf1f3384e8e6d1dacca5f8c3f0b69..13ab4a70f8208c998edeeddffea0b694d2b1347f 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -2079,12 +2079,18 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/leaf-server/minecraft-patches/features/0080-Ignore-null-legacy-structure-data.patch b/leaf-server/minecraft-patches/features/0079-Ignore-null-legacy-structure-data.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0080-Ignore-null-legacy-structure-data.patch rename to leaf-server/minecraft-patches/features/0079-Ignore-null-legacy-structure-data.patch diff --git a/leaf-server/minecraft-patches/features/0081-Prevent-entities-random-strolling-into-non-ticking-c.patch b/leaf-server/minecraft-patches/features/0080-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0081-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to leaf-server/minecraft-patches/features/0080-Prevent-entities-random-strolling-into-non-ticking-c.patch diff --git a/leaf-server/minecraft-patches/features/0082-Do-not-place-player-in-world-if-kicked-before-being-.patch b/leaf-server/minecraft-patches/features/0081-Do-not-place-player-in-world-if-kicked-before-being-.patch similarity index 94% rename from leaf-server/minecraft-patches/features/0082-Do-not-place-player-in-world-if-kicked-before-being-.patch rename to leaf-server/minecraft-patches/features/0081-Do-not-place-player-in-world-if-kicked-before-being-.patch index cad35446..51431019 100644 --- a/leaf-server/minecraft-patches/features/0082-Do-not-place-player-in-world-if-kicked-before-being-.patch +++ b/leaf-server/minecraft-patches/features/0081-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/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java -index 0c80d22ac19e8507a54e3ea0b3df5fa5ee853f89..11015e8c0f2b5f8bd2eb083d8e093beb72c43cf0 100644 +index 4a3f06a4677348c1277669514f9acef7a4334f1d..d2dc48d5a42506716bcbe0854a860b1eaa3b5705 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java @@ -235,6 +235,13 @@ public abstract class PlayerList { diff --git a/leaf-server/minecraft-patches/features/0083-Global-EULA-file.patch b/leaf-server/minecraft-patches/features/0082-Global-EULA-file.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0083-Global-EULA-file.patch rename to leaf-server/minecraft-patches/features/0082-Global-EULA-file.patch diff --git a/leaf-server/minecraft-patches/features/0084-5-second-TPS-average.patch b/leaf-server/minecraft-patches/features/0083-5-second-TPS-average.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0084-5-second-TPS-average.patch rename to leaf-server/minecraft-patches/features/0083-5-second-TPS-average.patch index 7c5eceb8..e730af9b 100644 --- a/leaf-server/minecraft-patches/features/0084-5-second-TPS-average.patch +++ b/leaf-server/minecraft-patches/features/0083-5-second-TPS-average.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/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 2505000585f6b726914861faf8f731bd7e83a34a..660107ce94c6d0a03a0da11b72795ec89434351f 100644 +index 923fc9d611d46017cf7ac8e6de6cf0966e0ce9f9..32b8613c62971bc7481d5242ee15b84cb1b361a7 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -1091,6 +1091,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop attributesToUpdate = new it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet<>(0); // Gale end - Lithium - replace AI attributes with optimized collections private final AttributeSupplier supplier; - private final java.util.function.Function, AttributeInstance> createInstance; // Gale - Airplane - reduce entity allocations + private final net.minecraft.world.entity.LivingEntity entity; // Purpur - Ridables public AttributeMap(AttributeSupplier supplier) { @@ -2846,7 +2846,6 @@ index 93a079df455e371a0ca7ada253dc8b7e16b0146f..701025715e0aca3c1f920a66f9b3d03e + this.entity = entity; + // Purpur end - Ridables + this.supplier = defaultAttributes; - this.createInstance = holder -> this.supplier.createInstance(this::onAttributeModified, holder); // Gale - Airplane - reduce entity allocations } private void onAttributeModified(AttributeInstance instance) { @@ -2856,7 +2855,7 @@ index 93a079df455e371a0ca7ada253dc8b7e16b0146f..701025715e0aca3c1f920a66f9b3d03e this.attributesToSync.add(instance); } } -@@ -43,7 +50,7 @@ public class AttributeMap { +@@ -41,7 +48,7 @@ public class AttributeMap { } public Collection getSyncableAttributes() { diff --git a/leaf-server/minecraft-patches/features/0100-Fix-Pufferfish-and-Purpur-patches.patch b/leaf-server/minecraft-patches/features/0099-Fix-Pufferfish-and-Purpur-patches.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0100-Fix-Pufferfish-and-Purpur-patches.patch rename to leaf-server/minecraft-patches/features/0099-Fix-Pufferfish-and-Purpur-patches.patch diff --git a/leaf-server/minecraft-patches/features/0101-Purpur-Configurable-server-mod-name.patch b/leaf-server/minecraft-patches/features/0100-Purpur-Configurable-server-mod-name.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0101-Purpur-Configurable-server-mod-name.patch rename to leaf-server/minecraft-patches/features/0100-Purpur-Configurable-server-mod-name.patch diff --git a/leaf-server/minecraft-patches/features/0102-Configurable-server-GUI-name.patch b/leaf-server/minecraft-patches/features/0101-Configurable-server-GUI-name.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0102-Configurable-server-GUI-name.patch rename to leaf-server/minecraft-patches/features/0101-Configurable-server-GUI-name.patch diff --git a/leaf-server/minecraft-patches/features/0103-Remove-vanilla-username-check.patch b/leaf-server/minecraft-patches/features/0102-Remove-vanilla-username-check.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0103-Remove-vanilla-username-check.patch rename to leaf-server/minecraft-patches/features/0102-Remove-vanilla-username-check.patch diff --git a/leaf-server/minecraft-patches/features/0104-Remove-Spigot-check-for-broken-BungeeCord-configurat.patch b/leaf-server/minecraft-patches/features/0103-Remove-Spigot-check-for-broken-BungeeCord-configurat.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0104-Remove-Spigot-check-for-broken-BungeeCord-configurat.patch rename to leaf-server/minecraft-patches/features/0103-Remove-Spigot-check-for-broken-BungeeCord-configurat.patch diff --git a/leaf-server/minecraft-patches/features/0105-Remove-UseItemOnPacket-Too-Far-check.patch b/leaf-server/minecraft-patches/features/0104-Remove-UseItemOnPacket-Too-Far-check.patch similarity index 95% rename from leaf-server/minecraft-patches/features/0105-Remove-UseItemOnPacket-Too-Far-check.patch rename to leaf-server/minecraft-patches/features/0104-Remove-UseItemOnPacket-Too-Far-check.patch index f1d811bd..2d46587f 100644 --- a/leaf-server/minecraft-patches/features/0105-Remove-UseItemOnPacket-Too-Far-check.patch +++ b/leaf-server/minecraft-patches/features/0104-Remove-UseItemOnPacket-Too-Far-check.patch @@ -7,7 +7,7 @@ This Check is added in 1.17.x -> 1.18.x that updated by Mojang. By removing this check, it gives ability for hackers to use some modules of hack clients. diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 39d4ae0ae1ec89007fe1c86dc8d3409902890552..470660998d3df511f00936bcaa210142ab8ba7b2 100644 +index 586c00610fdba178f27391820d623c3a5254529f..44e96e867d8a4403a7c88f772d2aa60cbe9f516b 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2075,8 +2075,13 @@ public class ServerGamePacketListenerImpl diff --git a/leaf-server/minecraft-patches/features/0106-Remove-change-non-editable-sign-warning.patch b/leaf-server/minecraft-patches/features/0105-Remove-change-non-editable-sign-warning.patch similarity index 93% rename from leaf-server/minecraft-patches/features/0106-Remove-change-non-editable-sign-warning.patch rename to leaf-server/minecraft-patches/features/0105-Remove-change-non-editable-sign-warning.patch index d47285c3..4fbcb65f 100644 --- a/leaf-server/minecraft-patches/features/0106-Remove-change-non-editable-sign-warning.patch +++ b/leaf-server/minecraft-patches/features/0105-Remove-change-non-editable-sign-warning.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remove change non-editable sign warning diff --git a/net/minecraft/world/level/block/entity/SignBlockEntity.java b/net/minecraft/world/level/block/entity/SignBlockEntity.java -index c5184985867b40daf2d86ed8b354f8d0fc960329..d77f165730df7eb1ee5bcfbfb41acbbda9311fe7 100644 +index 4c5de8783b2fc87a442e194e0069ce9cd5b5fd6c..f150c1e963dc5e7d968e1656f6f1884fe4762202 100644 --- a/net/minecraft/world/level/block/entity/SignBlockEntity.java +++ b/net/minecraft/world/level/block/entity/SignBlockEntity.java @@ -140,7 +140,7 @@ public class SignBlockEntity extends BlockEntity { diff --git a/leaf-server/minecraft-patches/features/0107-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch b/leaf-server/minecraft-patches/features/0106-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0107-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch rename to leaf-server/minecraft-patches/features/0106-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch diff --git a/leaf-server/minecraft-patches/features/0108-Carpet-Fixes-Optimized-getBiome-method.patch b/leaf-server/minecraft-patches/features/0107-Carpet-Fixes-Optimized-getBiome-method.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0108-Carpet-Fixes-Optimized-getBiome-method.patch rename to leaf-server/minecraft-patches/features/0107-Carpet-Fixes-Optimized-getBiome-method.patch diff --git a/leaf-server/minecraft-patches/features/0109-Carpet-Fixes-Use-optimized-RecipeManager.patch b/leaf-server/minecraft-patches/features/0108-Carpet-Fixes-Use-optimized-RecipeManager.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0109-Carpet-Fixes-Use-optimized-RecipeManager.patch rename to leaf-server/minecraft-patches/features/0108-Carpet-Fixes-Use-optimized-RecipeManager.patch diff --git a/leaf-server/minecraft-patches/features/0110-Akarin-Save-Json-list-asynchronously.patch b/leaf-server/minecraft-patches/features/0109-Akarin-Save-Json-list-asynchronously.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0110-Akarin-Save-Json-list-asynchronously.patch rename to leaf-server/minecraft-patches/features/0109-Akarin-Save-Json-list-asynchronously.patch diff --git a/leaf-server/minecraft-patches/features/0111-Slice-Smooth-Teleports.patch b/leaf-server/minecraft-patches/features/0110-Slice-Smooth-Teleports.patch similarity index 97% rename from leaf-server/minecraft-patches/features/0111-Slice-Smooth-Teleports.patch rename to leaf-server/minecraft-patches/features/0110-Slice-Smooth-Teleports.patch index 858d6b61..47b881eb 100644 --- a/leaf-server/minecraft-patches/features/0111-Slice-Smooth-Teleports.patch +++ b/leaf-server/minecraft-patches/features/0110-Slice-Smooth-Teleports.patch @@ -9,7 +9,7 @@ Original project: https://github.com/Cryptite/Slice Co-authored-by: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com> diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 6bc6000c45f35ff85b36bede9d6010d8452b1f21..a05cd22bfe3a2c25a5e37c973766a162ce8e7244 100644 +index 834829427f3388c6cd94b5ceadc18b234c579f26..5775a39220bb5f48e2ce01c51402ac8b194a8d9d 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -423,6 +423,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/leaf-server/minecraft-patches/features/0112-Parchment-Make-FixLight-use-action-bar.patch b/leaf-server/minecraft-patches/features/0111-Parchment-Make-FixLight-use-action-bar.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0112-Parchment-Make-FixLight-use-action-bar.patch rename to leaf-server/minecraft-patches/features/0111-Parchment-Make-FixLight-use-action-bar.patch diff --git a/leaf-server/minecraft-patches/features/0113-Leaves-Protocol-Core.patch b/leaf-server/minecraft-patches/features/0112-Leaves-Protocol-Core.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0113-Leaves-Protocol-Core.patch rename to leaf-server/minecraft-patches/features/0112-Leaves-Protocol-Core.patch diff --git a/leaf-server/minecraft-patches/features/0114-Leaves-Jade-Protocol.patch b/leaf-server/minecraft-patches/features/0113-Leaves-Jade-Protocol.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0114-Leaves-Jade-Protocol.patch rename to leaf-server/minecraft-patches/features/0113-Leaves-Jade-Protocol.patch diff --git a/leaf-server/minecraft-patches/features/0115-Leaves-Xaero-Map-Protocol.patch b/leaf-server/minecraft-patches/features/0114-Leaves-Xaero-Map-Protocol.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0115-Leaves-Xaero-Map-Protocol.patch rename to leaf-server/minecraft-patches/features/0114-Leaves-Xaero-Map-Protocol.patch diff --git a/leaf-server/minecraft-patches/features/0116-Leaves-Syncmatica-Protocol.patch b/leaf-server/minecraft-patches/features/0115-Leaves-Syncmatica-Protocol.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0116-Leaves-Syncmatica-Protocol.patch rename to leaf-server/minecraft-patches/features/0115-Leaves-Syncmatica-Protocol.patch diff --git a/leaf-server/minecraft-patches/features/0117-Leaves-Replay-Mod-API.patch b/leaf-server/minecraft-patches/features/0116-Leaves-Replay-Mod-API.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0117-Leaves-Replay-Mod-API.patch rename to leaf-server/minecraft-patches/features/0116-Leaves-Replay-Mod-API.patch diff --git a/leaf-server/minecraft-patches/features/0118-Petal-Async-Pathfinding.patch b/leaf-server/minecraft-patches/features/0117-Petal-Async-Pathfinding.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0118-Petal-Async-Pathfinding.patch rename to leaf-server/minecraft-patches/features/0117-Petal-Async-Pathfinding.patch diff --git a/leaf-server/minecraft-patches/features/0119-Petal-reduce-work-done-by-game-event-system.patch b/leaf-server/minecraft-patches/features/0118-Petal-reduce-work-done-by-game-event-system.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0119-Petal-reduce-work-done-by-game-event-system.patch rename to leaf-server/minecraft-patches/features/0118-Petal-reduce-work-done-by-game-event-system.patch diff --git a/leaf-server/minecraft-patches/features/0120-Reduce-canSee-work.patch b/leaf-server/minecraft-patches/features/0119-Reduce-canSee-work.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0120-Reduce-canSee-work.patch rename to leaf-server/minecraft-patches/features/0119-Reduce-canSee-work.patch diff --git a/leaf-server/minecraft-patches/features/0121-Fix-sprint-glitch.patch b/leaf-server/minecraft-patches/features/0120-Fix-sprint-glitch.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0121-Fix-sprint-glitch.patch rename to leaf-server/minecraft-patches/features/0120-Fix-sprint-glitch.patch diff --git a/leaf-server/minecraft-patches/features/0122-Configurable-movement-speed-of-more-entities.patch b/leaf-server/minecraft-patches/features/0121-Configurable-movement-speed-of-more-entities.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0122-Configurable-movement-speed-of-more-entities.patch rename to leaf-server/minecraft-patches/features/0121-Configurable-movement-speed-of-more-entities.patch diff --git a/leaf-server/minecraft-patches/features/0123-Faster-sequencing-of-futures-for-chunk-structure-gen.patch b/leaf-server/minecraft-patches/features/0122-Faster-sequencing-of-futures-for-chunk-structure-gen.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0123-Faster-sequencing-of-futures-for-chunk-structure-gen.patch rename to leaf-server/minecraft-patches/features/0122-Faster-sequencing-of-futures-for-chunk-structure-gen.patch diff --git a/leaf-server/minecraft-patches/features/0124-Reduce-active-items-finding-hopper-nearby-check.patch b/leaf-server/minecraft-patches/features/0123-Reduce-active-items-finding-hopper-nearby-check.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0124-Reduce-active-items-finding-hopper-nearby-check.patch rename to leaf-server/minecraft-patches/features/0123-Reduce-active-items-finding-hopper-nearby-check.patch diff --git a/leaf-server/minecraft-patches/features/0125-Plazma-Add-some-missing-Pufferfish-configurations.patch b/leaf-server/minecraft-patches/features/0124-Plazma-Add-some-missing-Pufferfish-configurations.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0125-Plazma-Add-some-missing-Pufferfish-configurations.patch rename to leaf-server/minecraft-patches/features/0124-Plazma-Add-some-missing-Pufferfish-configurations.patch diff --git a/leaf-server/minecraft-patches/features/0126-Plazma-Add-missing-purpur-configuration-options.patch b/leaf-server/minecraft-patches/features/0125-Plazma-Add-missing-purpur-configuration-options.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0126-Plazma-Add-missing-purpur-configuration-options.patch rename to leaf-server/minecraft-patches/features/0125-Plazma-Add-missing-purpur-configuration-options.patch diff --git a/leaf-server/minecraft-patches/features/0127-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/leaf-server/minecraft-patches/features/0126-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0127-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to leaf-server/minecraft-patches/features/0126-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/leaf-server/minecraft-patches/features/0128-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch b/leaf-server/minecraft-patches/features/0127-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0128-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch rename to leaf-server/minecraft-patches/features/0127-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch diff --git a/leaf-server/minecraft-patches/features/0129-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch b/leaf-server/minecraft-patches/features/0128-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0129-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch rename to leaf-server/minecraft-patches/features/0128-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch diff --git a/leaf-server/minecraft-patches/features/0130-SparklyPaper-Optimize-canSee-checks.patch b/leaf-server/minecraft-patches/features/0129-SparklyPaper-Optimize-canSee-checks.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0130-SparklyPaper-Optimize-canSee-checks.patch rename to leaf-server/minecraft-patches/features/0129-SparklyPaper-Optimize-canSee-checks.patch diff --git a/leaf-server/minecraft-patches/features/0131-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch b/leaf-server/minecraft-patches/features/0130-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0131-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch rename to leaf-server/minecraft-patches/features/0130-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch diff --git a/leaf-server/minecraft-patches/features/0132-Polpot-Make-egg-and-snowball-can-knockback-player.patch b/leaf-server/minecraft-patches/features/0131-Polpot-Make-egg-and-snowball-can-knockback-player.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0132-Polpot-Make-egg-and-snowball-can-knockback-player.patch rename to leaf-server/minecraft-patches/features/0131-Polpot-Make-egg-and-snowball-can-knockback-player.patch diff --git a/leaf-server/minecraft-patches/features/0133-Redirect-vanilla-getProfiler-to-inactive-in-PathNavi.patch b/leaf-server/minecraft-patches/features/0132-Redirect-vanilla-getProfiler-to-inactive-in-PathNavi.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0133-Redirect-vanilla-getProfiler-to-inactive-in-PathNavi.patch rename to leaf-server/minecraft-patches/features/0132-Redirect-vanilla-getProfiler-to-inactive-in-PathNavi.patch diff --git a/leaf-server/minecraft-patches/features/0134-Remove-useless-creating-stats-json-bases-on-player-n.patch b/leaf-server/minecraft-patches/features/0133-Remove-useless-creating-stats-json-bases-on-player-n.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0134-Remove-useless-creating-stats-json-bases-on-player-n.patch rename to leaf-server/minecraft-patches/features/0133-Remove-useless-creating-stats-json-bases-on-player-n.patch diff --git a/leaf-server/minecraft-patches/features/0135-Improve-Purpur-AFK-system.patch b/leaf-server/minecraft-patches/features/0134-Improve-Purpur-AFK-system.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0135-Improve-Purpur-AFK-system.patch rename to leaf-server/minecraft-patches/features/0134-Improve-Purpur-AFK-system.patch diff --git a/leaf-server/minecraft-patches/features/0136-Virtual-thread-for-chat-executor.patch b/leaf-server/minecraft-patches/features/0135-Virtual-thread-for-chat-executor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0136-Virtual-thread-for-chat-executor.patch rename to leaf-server/minecraft-patches/features/0135-Virtual-thread-for-chat-executor.patch diff --git a/leaf-server/minecraft-patches/features/0137-Virtual-thread-for-user-authenticator.patch b/leaf-server/minecraft-patches/features/0136-Virtual-thread-for-user-authenticator.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0137-Virtual-thread-for-user-authenticator.patch rename to leaf-server/minecraft-patches/features/0136-Virtual-thread-for-user-authenticator.patch diff --git a/leaf-server/minecraft-patches/features/0138-Mirai-Configurable-chat-message-signatures.patch b/leaf-server/minecraft-patches/features/0137-Mirai-Configurable-chat-message-signatures.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0138-Mirai-Configurable-chat-message-signatures.patch rename to leaf-server/minecraft-patches/features/0137-Mirai-Configurable-chat-message-signatures.patch diff --git a/leaf-server/minecraft-patches/features/0139-Cache-player-profileResult.patch b/leaf-server/minecraft-patches/features/0138-Cache-player-profileResult.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0139-Cache-player-profileResult.patch rename to leaf-server/minecraft-patches/features/0138-Cache-player-profileResult.patch diff --git a/leaf-server/minecraft-patches/features/0140-Matter-Secure-Seed.patch b/leaf-server/minecraft-patches/features/0139-Matter-Secure-Seed.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0140-Matter-Secure-Seed.patch rename to leaf-server/minecraft-patches/features/0139-Matter-Secure-Seed.patch index c03a05e6..2452640d 100644 --- a/leaf-server/minecraft-patches/features/0140-Matter-Secure-Seed.patch +++ b/leaf-server/minecraft-patches/features/0139-Matter-Secure-Seed.patch @@ -36,7 +36,7 @@ index 5748658abf0b90812005ae9d426df92daf5532f0..4a0eed7d7645ed539857592d233214e9 this.get("generator-settings", property -> GsonHelper.parse(!property.isEmpty() ? property : "{}"), new JsonObject()), this.get("level-type", property -> property.toLowerCase(Locale.ROOT), WorldPresets.NORMAL.location().toString()) diff --git a/net/minecraft/server/level/ServerChunkCache.java b/net/minecraft/server/level/ServerChunkCache.java -index 229e115447b06db3e3b440ee8ea0505979656846..a9acfc3ba6c3447b4632d32fe24e9a09d55ba1e2 100644 +index e67196b815dad6baa823822285cff83848e549ce..ac7b4625ed9ec94ca438b6fedcd3e6bb6414b157 100644 --- a/net/minecraft/server/level/ServerChunkCache.java +++ b/net/minecraft/server/level/ServerChunkCache.java @@ -674,6 +674,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon diff --git a/leaf-server/minecraft-patches/features/0141-Matter-Secure-Seed-command.patch b/leaf-server/minecraft-patches/features/0140-Matter-Secure-Seed-command.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0141-Matter-Secure-Seed-command.patch rename to leaf-server/minecraft-patches/features/0140-Matter-Secure-Seed-command.patch diff --git a/leaf-server/minecraft-patches/features/0142-Faster-random-generator.patch b/leaf-server/minecraft-patches/features/0141-Faster-random-generator.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0142-Faster-random-generator.patch rename to leaf-server/minecraft-patches/features/0141-Faster-random-generator.patch index d5c5efac..5a3bac6e 100644 --- a/leaf-server/minecraft-patches/features/0142-Faster-random-generator.patch +++ b/leaf-server/minecraft-patches/features/0141-Faster-random-generator.patch @@ -14,7 +14,7 @@ ThreadUnsafeRandom (Moonrise): 102,265,100 ns SimpleThreadUnsafeRandom (Moonrise): 97,054,600 ns diff --git a/net/minecraft/server/level/ServerChunkCache.java b/net/minecraft/server/level/ServerChunkCache.java -index a9acfc3ba6c3447b4632d32fe24e9a09d55ba1e2..0f9d18dd29e210ad656da211a3cb1cb25cd4efb1 100644 +index ac7b4625ed9ec94ca438b6fedcd3e6bb6414b157..6d5a15122079f2d1568ceb7086db21ad454f58e6 100644 --- a/net/minecraft/server/level/ServerChunkCache.java +++ b/net/minecraft/server/level/ServerChunkCache.java @@ -154,7 +154,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon @@ -97,7 +97,7 @@ index 8516d47b0ba79d91638837199e7ae0fb6cb44a79..4f4b55dd099dd2c2fea118b18b535881 RandomSource fork(); diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 4e3b73bee5dae2b5921db86cc53b4cd9ebbd06f8..fa44ddaeac193a686211a9ede5993674626b8e25 100644 +index d4a7cabf25b3ba2b085c68a3a7ed73a072c5e7fa..ddaaf29305a9cdb6dcccd38d4ec37fac6f0a1a51 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -149,7 +149,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/leaf-server/minecraft-patches/features/0143-Don-t-save-primed-tnt-entity.patch b/leaf-server/minecraft-patches/features/0142-Don-t-save-primed-tnt-entity.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0143-Don-t-save-primed-tnt-entity.patch rename to leaf-server/minecraft-patches/features/0142-Don-t-save-primed-tnt-entity.patch diff --git a/leaf-server/minecraft-patches/features/0144-Don-t-save-falling-block-entity.patch b/leaf-server/minecraft-patches/features/0143-Don-t-save-falling-block-entity.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0144-Don-t-save-falling-block-entity.patch rename to leaf-server/minecraft-patches/features/0143-Don-t-save-falling-block-entity.patch diff --git a/leaf-server/minecraft-patches/features/0145-Configurable-connection-message.patch b/leaf-server/minecraft-patches/features/0144-Configurable-connection-message.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0145-Configurable-connection-message.patch rename to leaf-server/minecraft-patches/features/0144-Configurable-connection-message.patch diff --git a/leaf-server/minecraft-patches/features/0146-Configurable-unknown-command-message.patch b/leaf-server/minecraft-patches/features/0145-Configurable-unknown-command-message.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0146-Configurable-unknown-command-message.patch rename to leaf-server/minecraft-patches/features/0145-Configurable-unknown-command-message.patch diff --git a/leaf-server/minecraft-patches/features/0147-Remove-stream-in-BlockBehaviour-cache-blockstate.patch b/leaf-server/minecraft-patches/features/0146-Remove-stream-in-BlockBehaviour-cache-blockstate.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0147-Remove-stream-in-BlockBehaviour-cache-blockstate.patch rename to leaf-server/minecraft-patches/features/0146-Remove-stream-in-BlockBehaviour-cache-blockstate.patch diff --git a/leaf-server/minecraft-patches/features/0148-Remove-stream-in-entity-visible-effects-filter.patch b/leaf-server/minecraft-patches/features/0147-Remove-stream-in-entity-visible-effects-filter.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0148-Remove-stream-in-entity-visible-effects-filter.patch rename to leaf-server/minecraft-patches/features/0147-Remove-stream-in-entity-visible-effects-filter.patch diff --git a/leaf-server/minecraft-patches/features/0149-Remove-stream-and-double-iteration-in-enough-deep-sl.patch b/leaf-server/minecraft-patches/features/0148-Remove-stream-and-double-iteration-in-enough-deep-sl.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0149-Remove-stream-and-double-iteration-in-enough-deep-sl.patch rename to leaf-server/minecraft-patches/features/0148-Remove-stream-and-double-iteration-in-enough-deep-sl.patch diff --git a/leaf-server/minecraft-patches/features/0150-Remove-stream-in-trial-spawner-ticking.patch b/leaf-server/minecraft-patches/features/0149-Remove-stream-in-trial-spawner-ticking.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0150-Remove-stream-in-trial-spawner-ticking.patch rename to leaf-server/minecraft-patches/features/0149-Remove-stream-in-trial-spawner-ticking.patch diff --git a/leaf-server/minecraft-patches/features/0151-Remove-stream-in-Brain.patch b/leaf-server/minecraft-patches/features/0150-Remove-stream-in-Brain.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0151-Remove-stream-in-Brain.patch rename to leaf-server/minecraft-patches/features/0150-Remove-stream-in-Brain.patch diff --git a/leaf-server/minecraft-patches/features/0152-Remove-stream-in-BehaviorUtils.patch b/leaf-server/minecraft-patches/features/0151-Remove-stream-in-BehaviorUtils.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0152-Remove-stream-in-BehaviorUtils.patch rename to leaf-server/minecraft-patches/features/0151-Remove-stream-in-BehaviorUtils.patch diff --git a/leaf-server/minecraft-patches/features/0153-Remove-stream-in-YieldJobSite.patch b/leaf-server/minecraft-patches/features/0152-Remove-stream-in-YieldJobSite.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0153-Remove-stream-in-YieldJobSite.patch rename to leaf-server/minecraft-patches/features/0152-Remove-stream-in-YieldJobSite.patch diff --git a/leaf-server/minecraft-patches/features/0154-Remove-stream-in-PlayerSensor.patch b/leaf-server/minecraft-patches/features/0153-Remove-stream-in-PlayerSensor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0154-Remove-stream-in-PlayerSensor.patch rename to leaf-server/minecraft-patches/features/0153-Remove-stream-in-PlayerSensor.patch diff --git a/leaf-server/minecraft-patches/features/0155-Remove-stream-in-GolemSensor.patch b/leaf-server/minecraft-patches/features/0154-Remove-stream-in-GolemSensor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0155-Remove-stream-in-GolemSensor.patch rename to leaf-server/minecraft-patches/features/0154-Remove-stream-in-GolemSensor.patch diff --git a/leaf-server/minecraft-patches/features/0156-Remove-stream-in-GateBehavior.patch b/leaf-server/minecraft-patches/features/0155-Remove-stream-in-GateBehavior.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0156-Remove-stream-in-GateBehavior.patch rename to leaf-server/minecraft-patches/features/0155-Remove-stream-in-GateBehavior.patch diff --git a/leaf-server/minecraft-patches/features/0157-Remove-stream-in-updateFluidOnEyes.patch b/leaf-server/minecraft-patches/features/0156-Remove-stream-in-updateFluidOnEyes.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0157-Remove-stream-in-updateFluidOnEyes.patch rename to leaf-server/minecraft-patches/features/0156-Remove-stream-in-updateFluidOnEyes.patch diff --git a/leaf-server/minecraft-patches/features/0158-Remove-stream-in-matchingSlot.patch b/leaf-server/minecraft-patches/features/0157-Remove-stream-in-matchingSlot.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0158-Remove-stream-in-matchingSlot.patch rename to leaf-server/minecraft-patches/features/0157-Remove-stream-in-matchingSlot.patch diff --git a/leaf-server/minecraft-patches/features/0159-Remove-stream-in-entity-mountedOrDismounted-changes-.patch b/leaf-server/minecraft-patches/features/0158-Remove-stream-in-entity-mountedOrDismounted-changes-.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0159-Remove-stream-in-entity-mountedOrDismounted-changes-.patch rename to leaf-server/minecraft-patches/features/0158-Remove-stream-in-entity-mountedOrDismounted-changes-.patch diff --git a/leaf-server/minecraft-patches/features/0160-Replace-Entity-active-effects-map-with-optimized-col.patch b/leaf-server/minecraft-patches/features/0159-Replace-Entity-active-effects-map-with-optimized-col.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0160-Replace-Entity-active-effects-map-with-optimized-col.patch rename to leaf-server/minecraft-patches/features/0159-Replace-Entity-active-effects-map-with-optimized-col.patch diff --git a/leaf-server/minecraft-patches/features/0161-Replace-criterion-map-with-optimized-collection.patch b/leaf-server/minecraft-patches/features/0160-Replace-criterion-map-with-optimized-collection.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0161-Replace-criterion-map-with-optimized-collection.patch rename to leaf-server/minecraft-patches/features/0160-Replace-criterion-map-with-optimized-collection.patch diff --git a/leaf-server/minecraft-patches/features/0162-Replace-brain-maps-with-optimized-collection.patch b/leaf-server/minecraft-patches/features/0161-Replace-brain-maps-with-optimized-collection.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0162-Replace-brain-maps-with-optimized-collection.patch rename to leaf-server/minecraft-patches/features/0161-Replace-brain-maps-with-optimized-collection.patch diff --git a/leaf-server/minecraft-patches/features/0163-Reduce-worldgen-allocations.patch b/leaf-server/minecraft-patches/features/0162-Reduce-worldgen-allocations.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0163-Reduce-worldgen-allocations.patch rename to leaf-server/minecraft-patches/features/0162-Reduce-worldgen-allocations.patch diff --git a/leaf-server/minecraft-patches/features/0164-Use-caffeine-cache-for-kickPermission-instead-of-usi.patch b/leaf-server/minecraft-patches/features/0163-Use-caffeine-cache-for-kickPermission-instead-of-usi.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0164-Use-caffeine-cache-for-kickPermission-instead-of-usi.patch rename to leaf-server/minecraft-patches/features/0163-Use-caffeine-cache-for-kickPermission-instead-of-usi.patch diff --git a/leaf-server/minecraft-patches/features/0165-Do-not-place-player-if-the-server-is-full.patch b/leaf-server/minecraft-patches/features/0164-Do-not-place-player-if-the-server-is-full.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0165-Do-not-place-player-if-the-server-is-full.patch rename to leaf-server/minecraft-patches/features/0164-Do-not-place-player-if-the-server-is-full.patch diff --git a/leaf-server/minecraft-patches/features/0166-Fix-MC-65198.patch b/leaf-server/minecraft-patches/features/0165-Fix-MC-65198.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0166-Fix-MC-65198.patch rename to leaf-server/minecraft-patches/features/0165-Fix-MC-65198.patch diff --git a/leaf-server/minecraft-patches/features/0167-Fix-MC-200418.patch b/leaf-server/minecraft-patches/features/0166-Fix-MC-200418.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0167-Fix-MC-200418.patch rename to leaf-server/minecraft-patches/features/0166-Fix-MC-200418.patch diff --git a/leaf-server/minecraft-patches/features/0168-Fix-MC-119417.patch b/leaf-server/minecraft-patches/features/0167-Fix-MC-119417.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0168-Fix-MC-119417.patch rename to leaf-server/minecraft-patches/features/0167-Fix-MC-119417.patch diff --git a/leaf-server/minecraft-patches/features/0169-Fix-MC-223153.patch b/leaf-server/minecraft-patches/features/0168-Fix-MC-223153.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0169-Fix-MC-223153.patch rename to leaf-server/minecraft-patches/features/0168-Fix-MC-223153.patch diff --git a/leaf-server/minecraft-patches/features/0170-Configurable-player-knockback-zombie.patch b/leaf-server/minecraft-patches/features/0169-Configurable-player-knockback-zombie.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0170-Configurable-player-knockback-zombie.patch rename to leaf-server/minecraft-patches/features/0169-Configurable-player-knockback-zombie.patch diff --git a/leaf-server/minecraft-patches/features/0171-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch b/leaf-server/minecraft-patches/features/0170-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0171-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch rename to leaf-server/minecraft-patches/features/0170-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch index c74dc1b3..ebb89416 100644 --- a/leaf-server/minecraft-patches/features/0171-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch +++ b/leaf-server/minecraft-patches/features/0170-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch @@ -24,7 +24,7 @@ index cf136bc3d0d285ebde23c6e31c002933564fdcb2..c15b6e32bd00650366dc4ecba2abeb6b if (this.goalSelector.inactiveTick(this.activatedPriority, true) && !isThrottled) { // Pufferfish - pass activated priroity // Pufferfish - throttle inactive goal selector ticking this.goalSelector.tick(); diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java -index 530a7873a0796bb5e8e25b91586d6c4cfa00a08c..48384d7a9cb41506e0b5024baf806e56497e9d62 100644 +index acb0789b3e791cbb81c23efb9bbeae736db5f48c..4de268c2b563dca353748e12a0f5dc0729e6fc21 100644 --- a/net/minecraft/world/entity/npc/Villager.java +++ b/net/minecraft/world/entity/npc/Villager.java @@ -374,7 +374,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler diff --git a/leaf-server/minecraft-patches/features/0172-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch b/leaf-server/minecraft-patches/features/0171-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0172-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch rename to leaf-server/minecraft-patches/features/0171-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch diff --git a/leaf-server/minecraft-patches/features/0174-Dont-send-useless-entity-packets.patch b/leaf-server/minecraft-patches/features/0173-Dont-send-useless-entity-packets.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0174-Dont-send-useless-entity-packets.patch rename to leaf-server/minecraft-patches/features/0173-Dont-send-useless-entity-packets.patch diff --git a/leaf-server/minecraft-patches/features/0175-Multithreaded-Tracker.patch b/leaf-server/minecraft-patches/features/0174-Multithreaded-Tracker.patch similarity index 97% rename from leaf-server/minecraft-patches/features/0175-Multithreaded-Tracker.patch rename to leaf-server/minecraft-patches/features/0174-Multithreaded-Tracker.patch index fe8e2542..865add96 100644 --- a/leaf-server/minecraft-patches/features/0175-Multithreaded-Tracker.patch +++ b/leaf-server/minecraft-patches/features/0174-Multithreaded-Tracker.patch @@ -533,10 +533,10 @@ index 3ac9f36eae87369354e992a1d9b5c5b2d87d17cb..9f09d78a7dac12c7f1b06029d32ad93f return compoundTag; diff --git a/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/net/minecraft/world/entity/ai/attributes/AttributeMap.java -index 701025715e0aca3c1f920a66f9b3d03ec08eaf02..778872cdd1717f1ad52de32faf43847a08c55269 100644 +index 909c9b5b82f1a41087a594fe5b5c021feb22f5e3..bd3a9adb61be55f216199572612027643e05dab7 100644 --- a/net/minecraft/world/entity/ai/attributes/AttributeMap.java +++ b/net/minecraft/world/entity/ai/attributes/AttributeMap.java -@@ -15,12 +15,14 @@ import net.minecraft.resources.ResourceLocation; +@@ -15,9 +15,11 @@ import net.minecraft.resources.ResourceLocation; public class AttributeMap { // Gale start - Lithium - replace AI attributes with optimized collections @@ -550,17 +550,9 @@ index 701025715e0aca3c1f920a66f9b3d03ec08eaf02..778872cdd1717f1ad52de32faf43847a + // Leaf end - Multithreaded tracker // Gale end - Lithium - replace AI attributes with optimized collections private final AttributeSupplier supplier; -- private final java.util.function.Function, AttributeInstance> createInstance; // Gale - Airplane - reduce entity allocations -+ //private final java.util.function.Function, AttributeInstance> createInstance; // Gale - Airplane - reduce entity allocations // Leaf - Optimize AttributeMap private final net.minecraft.world.entity.LivingEntity entity; // Purpur - Ridables - - public AttributeMap(AttributeSupplier supplier) { -@@ -31,31 +33,54 @@ public class AttributeMap { - this.entity = entity; - // Purpur end - Ridables +@@ -32,28 +34,51 @@ public class AttributeMap { this.supplier = defaultAttributes; -- this.createInstance = holder -> this.supplier.createInstance(this::onAttributeModified, holder); // Gale - Airplane - reduce entity allocations -+ //this.createInstance = holder -> this.supplier.createInstance(this::onAttributeModified, holder); // Gale - Airplane - reduce entity allocations // Leaf - Optimize AttributeMap } - private void onAttributeModified(AttributeInstance instance) { @@ -602,7 +594,7 @@ index 701025715e0aca3c1f920a66f9b3d03ec08eaf02..778872cdd1717f1ad52de32faf43847a @Nullable public AttributeInstance getInstance(Holder attribute) { -- return this.attributes.computeIfAbsent(attribute, this.createInstance); // Gale - Airplane - reduce entity allocations - cache lambda, as for some reason java allocates it anyways +- return this.attributes.computeIfAbsent(attribute, holder -> this.supplier.createInstance(this::onAttributeModified, (Holder)holder)); + // Leaf start - Multithreaded tracker + AttributeInstance v; + if ((v = this.attributes.get(attribute)) == null) { diff --git a/leaf-server/minecraft-patches/features/0176-Nitori-Async-playerdata-saving.patch b/leaf-server/minecraft-patches/features/0175-Nitori-Async-playerdata-saving.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0176-Nitori-Async-playerdata-saving.patch rename to leaf-server/minecraft-patches/features/0175-Nitori-Async-playerdata-saving.patch diff --git a/leaf-server/minecraft-patches/features/0177-Optimize-nearby-alive-players-for-spawning.patch b/leaf-server/minecraft-patches/features/0176-Optimize-nearby-alive-players-for-spawning.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0177-Optimize-nearby-alive-players-for-spawning.patch rename to leaf-server/minecraft-patches/features/0176-Optimize-nearby-alive-players-for-spawning.patch diff --git a/leaf-server/minecraft-patches/features/0178-Cache-blockstate-cache-array.patch b/leaf-server/minecraft-patches/features/0177-Cache-blockstate-cache-array.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0178-Cache-blockstate-cache-array.patch rename to leaf-server/minecraft-patches/features/0177-Cache-blockstate-cache-array.patch diff --git a/leaf-server/minecraft-patches/features/0179-Asynchronous-locator.patch b/leaf-server/minecraft-patches/features/0178-Asynchronous-locator.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0179-Asynchronous-locator.patch rename to leaf-server/minecraft-patches/features/0178-Asynchronous-locator.patch diff --git a/leaf-server/minecraft-patches/features/0180-Smart-sort-entities-in-NearestLivingEntitySensor.patch b/leaf-server/minecraft-patches/features/0179-Smart-sort-entities-in-NearestLivingEntitySensor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0180-Smart-sort-entities-in-NearestLivingEntitySensor.patch rename to leaf-server/minecraft-patches/features/0179-Smart-sort-entities-in-NearestLivingEntitySensor.patch diff --git a/leaf-server/minecraft-patches/features/0181-Further-reduce-memory-footprint-of-CompoundTag.patch b/leaf-server/minecraft-patches/features/0180-Further-reduce-memory-footprint-of-CompoundTag.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0181-Further-reduce-memory-footprint-of-CompoundTag.patch rename to leaf-server/minecraft-patches/features/0180-Further-reduce-memory-footprint-of-CompoundTag.patch diff --git a/leaf-server/minecraft-patches/features/0182-Optimize-Entity-distanceToSqr.patch b/leaf-server/minecraft-patches/features/0181-Optimize-Entity-distanceToSqr.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0182-Optimize-Entity-distanceToSqr.patch rename to leaf-server/minecraft-patches/features/0181-Optimize-Entity-distanceToSqr.patch diff --git a/leaf-server/minecraft-patches/features/0183-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch b/leaf-server/minecraft-patches/features/0182-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0183-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch rename to leaf-server/minecraft-patches/features/0182-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch diff --git a/leaf-server/minecraft-patches/features/0184-Cache-tile-entity-position.patch b/leaf-server/minecraft-patches/features/0183-Cache-tile-entity-position.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0184-Cache-tile-entity-position.patch rename to leaf-server/minecraft-patches/features/0183-Cache-tile-entity-position.patch diff --git a/leaf-server/minecraft-patches/features/0185-TT20-Lag-compensation.patch b/leaf-server/minecraft-patches/features/0184-TT20-Lag-compensation.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0185-TT20-Lag-compensation.patch rename to leaf-server/minecraft-patches/features/0184-TT20-Lag-compensation.patch diff --git a/leaf-server/minecraft-patches/features/0186-C2ME-Reduce-Allocations.patch b/leaf-server/minecraft-patches/features/0185-C2ME-Reduce-Allocations.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0186-C2ME-Reduce-Allocations.patch rename to leaf-server/minecraft-patches/features/0185-C2ME-Reduce-Allocations.patch diff --git a/leaf-server/minecraft-patches/features/0187-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch b/leaf-server/minecraft-patches/features/0186-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0187-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch rename to leaf-server/minecraft-patches/features/0186-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch diff --git a/leaf-server/minecraft-patches/features/0188-Lithium-fast-util.patch b/leaf-server/minecraft-patches/features/0187-Lithium-fast-util.patch similarity index 97% rename from leaf-server/minecraft-patches/features/0188-Lithium-fast-util.patch rename to leaf-server/minecraft-patches/features/0187-Lithium-fast-util.patch index 60b9192d..1396d333 100644 --- a/leaf-server/minecraft-patches/features/0188-Lithium-fast-util.patch +++ b/leaf-server/minecraft-patches/features/0187-Lithium-fast-util.patch @@ -11,7 +11,7 @@ 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/net/minecraft/core/Direction.java b/net/minecraft/core/Direction.java -index 63fd7b45750430b565d599337d3112cbaa7e7550..1363c80e7c7be20c52a947f2eb6fabc5e5b6c97c 100644 +index 56a5903f5a919dd2fc8da9a1693bcee42eb29973..2cea11ad32d78dd1d0650912bfa35d7ae02a4fc5 100644 --- a/net/minecraft/core/Direction.java +++ b/net/minecraft/core/Direction.java @@ -222,7 +222,7 @@ public enum Direction implements StringRepresentable, ca.spottedleaf.moonrise.pa diff --git a/leaf-server/minecraft-patches/features/0189-Lithium-cached-iterate-outwards.patch b/leaf-server/minecraft-patches/features/0188-Lithium-cached-iterate-outwards.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0189-Lithium-cached-iterate-outwards.patch rename to leaf-server/minecraft-patches/features/0188-Lithium-cached-iterate-outwards.patch diff --git a/leaf-server/minecraft-patches/features/0190-Use-faster-and-thread-safe-ban-list-date-format-pars.patch b/leaf-server/minecraft-patches/features/0189-Use-faster-and-thread-safe-ban-list-date-format-pars.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0190-Use-faster-and-thread-safe-ban-list-date-format-pars.patch rename to leaf-server/minecraft-patches/features/0189-Use-faster-and-thread-safe-ban-list-date-format-pars.patch diff --git a/leaf-server/minecraft-patches/features/0191-Lithium-equipment-tracking.patch b/leaf-server/minecraft-patches/features/0190-Lithium-equipment-tracking.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0191-Lithium-equipment-tracking.patch rename to leaf-server/minecraft-patches/features/0190-Lithium-equipment-tracking.patch diff --git a/leaf-server/minecraft-patches/features/0192-C2ME-Optimize-world-gen-math.patch b/leaf-server/minecraft-patches/features/0191-C2ME-Optimize-world-gen-math.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0192-C2ME-Optimize-world-gen-math.patch rename to leaf-server/minecraft-patches/features/0191-C2ME-Optimize-world-gen-math.patch diff --git a/leaf-server/minecraft-patches/features/0193-Cache-chunk-key.patch b/leaf-server/minecraft-patches/features/0192-Cache-chunk-key.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0193-Cache-chunk-key.patch rename to leaf-server/minecraft-patches/features/0192-Cache-chunk-key.patch diff --git a/leaf-server/minecraft-patches/features/0194-Cache-random-tick-block-status.patch b/leaf-server/minecraft-patches/features/0193-Cache-random-tick-block-status.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0194-Cache-random-tick-block-status.patch rename to leaf-server/minecraft-patches/features/0193-Cache-random-tick-block-status.patch diff --git a/leaf-server/minecraft-patches/features/0195-Cache-part-of-canHoldFluid-result.patch b/leaf-server/minecraft-patches/features/0194-Cache-part-of-canHoldFluid-result.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0195-Cache-part-of-canHoldFluid-result.patch rename to leaf-server/minecraft-patches/features/0194-Cache-part-of-canHoldFluid-result.patch diff --git a/leaf-server/minecraft-patches/features/0196-Configurable-tripwire-dupe.patch b/leaf-server/minecraft-patches/features/0195-Configurable-tripwire-dupe.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0196-Configurable-tripwire-dupe.patch rename to leaf-server/minecraft-patches/features/0195-Configurable-tripwire-dupe.patch diff --git a/leaf-server/minecraft-patches/features/0197-PaperPR-Fix-MC-117075-Block-Entities-Unload-Lag-Spik.patch b/leaf-server/minecraft-patches/features/0196-PaperPR-Fix-MC-117075-Block-Entities-Unload-Lag-Spik.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0197-PaperPR-Fix-MC-117075-Block-Entities-Unload-Lag-Spik.patch rename to leaf-server/minecraft-patches/features/0196-PaperPR-Fix-MC-117075-Block-Entities-Unload-Lag-Spik.patch diff --git a/leaf-server/minecraft-patches/features/0198-Sepals-Rearrange-the-attackable-conditions.patch b/leaf-server/minecraft-patches/features/0197-Sepals-Rearrange-the-attackable-conditions.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0198-Sepals-Rearrange-the-attackable-conditions.patch rename to leaf-server/minecraft-patches/features/0197-Sepals-Rearrange-the-attackable-conditions.patch diff --git a/leaf-server/minecraft-patches/features/0199-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch b/leaf-server/minecraft-patches/features/0198-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0199-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch rename to leaf-server/minecraft-patches/features/0198-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch diff --git a/leaf-server/minecraft-patches/features/0200-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch b/leaf-server/minecraft-patches/features/0199-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0200-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch rename to leaf-server/minecraft-patches/features/0199-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch diff --git a/leaf-server/minecraft-patches/features/0201-Optimize-checking-nearby-players-for-spawning.patch b/leaf-server/minecraft-patches/features/0200-Optimize-checking-nearby-players-for-spawning.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0201-Optimize-checking-nearby-players-for-spawning.patch rename to leaf-server/minecraft-patches/features/0200-Optimize-checking-nearby-players-for-spawning.patch diff --git a/leaf-server/minecraft-patches/features/0202-Cache-supporting-block-check.patch b/leaf-server/minecraft-patches/features/0201-Cache-supporting-block-check.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0202-Cache-supporting-block-check.patch rename to leaf-server/minecraft-patches/features/0201-Cache-supporting-block-check.patch diff --git a/leaf-server/minecraft-patches/features/0203-Avoid-useless-deque-clear-on-LevelTicks-cleanupAfter.patch b/leaf-server/minecraft-patches/features/0202-Avoid-useless-deque-clear-on-LevelTicks-cleanupAfter.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0203-Avoid-useless-deque-clear-on-LevelTicks-cleanupAfter.patch rename to leaf-server/minecraft-patches/features/0202-Avoid-useless-deque-clear-on-LevelTicks-cleanupAfter.patch diff --git a/leaf-server/minecraft-patches/features/0204-Replace-brain-activity-maps-with-optimized-collectio.patch b/leaf-server/minecraft-patches/features/0203-Replace-brain-activity-maps-with-optimized-collectio.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0204-Replace-brain-activity-maps-with-optimized-collectio.patch rename to leaf-server/minecraft-patches/features/0203-Replace-brain-activity-maps-with-optimized-collectio.patch diff --git a/leaf-server/minecraft-patches/features/0205-Remove-stream-in-villagers.patch b/leaf-server/minecraft-patches/features/0204-Remove-stream-in-villagers.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0205-Remove-stream-in-villagers.patch rename to leaf-server/minecraft-patches/features/0204-Remove-stream-in-villagers.patch index d8ccd641..8176e74c 100644 --- a/leaf-server/minecraft-patches/features/0205-Remove-stream-in-villagers.patch +++ b/leaf-server/minecraft-patches/features/0204-Remove-stream-in-villagers.patch @@ -41,7 +41,7 @@ index 72cca4897f9697573fd6987a5f0d2df52761b8c3..04eea77cf84aaeb781608e48f2aa32f3 private static void throwHalfStack(Villager villager, Set stack, LivingEntity entity) { diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java -index 48384d7a9cb41506e0b5024baf806e56497e9d62..ffc46d3ffe6d3a577fbad381f1f7d82d78e33d2a 100644 +index 4de268c2b563dca353748e12a0f5dc0729e6fc21..5cc4b2a0d10b25c57c582772ac6757442780afb0 100644 --- a/net/minecraft/world/entity/npc/Villager.java +++ b/net/minecraft/world/entity/npc/Villager.java @@ -972,7 +972,17 @@ public class Villager extends AbstractVillager implements ReputationEventHandler diff --git a/leaf-server/minecraft-patches/features/0206-Optimize-baby-villager-sensor.patch b/leaf-server/minecraft-patches/features/0205-Optimize-baby-villager-sensor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0206-Optimize-baby-villager-sensor.patch rename to leaf-server/minecraft-patches/features/0205-Optimize-baby-villager-sensor.patch diff --git a/leaf-server/minecraft-patches/features/0207-Only-player-pushable.patch b/leaf-server/minecraft-patches/features/0206-Only-player-pushable.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0207-Only-player-pushable.patch rename to leaf-server/minecraft-patches/features/0206-Only-player-pushable.patch diff --git a/leaf-server/minecraft-patches/features/0208-Remove-iterators-from-Inventory.patch b/leaf-server/minecraft-patches/features/0207-Remove-iterators-from-Inventory.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0208-Remove-iterators-from-Inventory.patch rename to leaf-server/minecraft-patches/features/0207-Remove-iterators-from-Inventory.patch diff --git a/leaf-server/minecraft-patches/features/0209-Cache-eligible-players-for-despawn-checks.patch b/leaf-server/minecraft-patches/features/0208-Cache-eligible-players-for-despawn-checks.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0209-Cache-eligible-players-for-despawn-checks.patch rename to leaf-server/minecraft-patches/features/0208-Cache-eligible-players-for-despawn-checks.patch diff --git a/leaf-server/minecraft-patches/features/0210-Slightly-optimise-getNearestPlayer.patch b/leaf-server/minecraft-patches/features/0209-Slightly-optimise-getNearestPlayer.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0210-Slightly-optimise-getNearestPlayer.patch rename to leaf-server/minecraft-patches/features/0209-Slightly-optimise-getNearestPlayer.patch diff --git a/leaf-server/minecraft-patches/features/0211-Use-ensureCapacity-to-pre-populate-the-size-of-ticki.patch b/leaf-server/minecraft-patches/features/0210-Use-ensureCapacity-to-pre-populate-the-size-of-ticki.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0211-Use-ensureCapacity-to-pre-populate-the-size-of-ticki.patch rename to leaf-server/minecraft-patches/features/0210-Use-ensureCapacity-to-pre-populate-the-size-of-ticki.patch diff --git a/leaf-server/minecraft-patches/features/0212-Directly-use-the-pre-filtered-ticking-chunks-list-as.patch b/leaf-server/minecraft-patches/features/0211-Directly-use-the-pre-filtered-ticking-chunks-list-as.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0212-Directly-use-the-pre-filtered-ticking-chunks-list-as.patch rename to leaf-server/minecraft-patches/features/0211-Directly-use-the-pre-filtered-ticking-chunks-list-as.patch diff --git a/leaf-server/minecraft-patches/features/0213-Bulk-writes-to-writeLongArray-during-chunk-loading.patch b/leaf-server/minecraft-patches/features/0212-Bulk-writes-to-writeLongArray-during-chunk-loading.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0213-Bulk-writes-to-writeLongArray-during-chunk-loading.patch rename to leaf-server/minecraft-patches/features/0212-Bulk-writes-to-writeLongArray-during-chunk-loading.patch diff --git a/leaf-server/minecraft-patches/features/0214-Improve-sorting-in-SortedArraySet.patch b/leaf-server/minecraft-patches/features/0213-Improve-sorting-in-SortedArraySet.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0214-Improve-sorting-in-SortedArraySet.patch rename to leaf-server/minecraft-patches/features/0213-Improve-sorting-in-SortedArraySet.patch diff --git a/leaf-server/minecraft-patches/features/0215-Make-removeIf-slightly-faster.patch b/leaf-server/minecraft-patches/features/0214-Make-removeIf-slightly-faster.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0215-Make-removeIf-slightly-faster.patch rename to leaf-server/minecraft-patches/features/0214-Make-removeIf-slightly-faster.patch diff --git a/leaf-server/minecraft-patches/features/0216-Optimize-LinearPalette.patch b/leaf-server/minecraft-patches/features/0215-Optimize-LinearPalette.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0216-Optimize-LinearPalette.patch rename to leaf-server/minecraft-patches/features/0215-Optimize-LinearPalette.patch diff --git a/leaf-server/minecraft-patches/features/0217-Slightly-optimized-VarInt-write.patch b/leaf-server/minecraft-patches/features/0216-Slightly-optimized-VarInt-write.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0217-Slightly-optimized-VarInt-write.patch rename to leaf-server/minecraft-patches/features/0216-Slightly-optimized-VarInt-write.patch diff --git a/leaf-server/minecraft-patches/features/0218-Rewrite-ClientboundLightUpdatePacketData.patch b/leaf-server/minecraft-patches/features/0217-Rewrite-ClientboundLightUpdatePacketData.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0218-Rewrite-ClientboundLightUpdatePacketData.patch rename to leaf-server/minecraft-patches/features/0217-Rewrite-ClientboundLightUpdatePacketData.patch diff --git a/leaf-server/minecraft-patches/features/0219-Async-chunk-send.patch b/leaf-server/minecraft-patches/features/0218-Async-chunk-send.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0219-Async-chunk-send.patch rename to leaf-server/minecraft-patches/features/0218-Async-chunk-send.patch diff --git a/leaf-server/minecraft-patches/features/0220-Spawner-Configurations.patch b/leaf-server/minecraft-patches/features/0219-Spawner-Configurations.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0220-Spawner-Configurations.patch rename to leaf-server/minecraft-patches/features/0219-Spawner-Configurations.patch diff --git a/leaf-server/minecraft-patches/features/0221-SparklyPaper-Parallel-world-ticking.patch b/leaf-server/minecraft-patches/features/0220-SparklyPaper-Parallel-world-ticking.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0221-SparklyPaper-Parallel-world-ticking.patch rename to leaf-server/minecraft-patches/features/0220-SparklyPaper-Parallel-world-ticking.patch index e35dfbe0..0fec1bf7 100644 --- a/leaf-server/minecraft-patches/features/0221-SparklyPaper-Parallel-world-ticking.patch +++ b/leaf-server/minecraft-patches/features/0220-SparklyPaper-Parallel-world-ticking.patch @@ -905,7 +905,7 @@ index 3614551856c594f3c0cfee984fcf03fad672b007..f4577f908ca9f279b72d89e5b0822d34 }); entity.getBrain().eraseMemory(MemoryModuleType.POTENTIAL_JOB_SITE); diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java -index ffc46d3ffe6d3a577fbad381f1f7d82d78e33d2a..63ce733ce78eb9bc630c497988949e18cbb56fe2 100644 +index 5cc4b2a0d10b25c57c582772ac6757442780afb0..92895a38c5ef7962db83e085a99c0b3766052541 100644 --- a/net/minecraft/world/entity/npc/Villager.java +++ b/net/minecraft/world/entity/npc/Villager.java @@ -795,13 +795,21 @@ public class Villager extends AbstractVillager implements ReputationEventHandler diff --git a/leaf-server/minecraft-patches/features/0222-SparklyPaper-Track-each-world-MSPT.patch b/leaf-server/minecraft-patches/features/0221-SparklyPaper-Track-each-world-MSPT.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0222-SparklyPaper-Track-each-world-MSPT.patch rename to leaf-server/minecraft-patches/features/0221-SparklyPaper-Track-each-world-MSPT.patch diff --git a/leaf-server/minecraft-patches/features/0223-PaperPR-Fix-cancelled-Projectile-Events-still-consum.patch b/leaf-server/minecraft-patches/features/0222-PaperPR-Fix-cancelled-Projectile-Events-still-consum.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0223-PaperPR-Fix-cancelled-Projectile-Events-still-consum.patch rename to leaf-server/minecraft-patches/features/0222-PaperPR-Fix-cancelled-Projectile-Events-still-consum.patch diff --git a/leaf-server/minecraft-patches/features/0224-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch b/leaf-server/minecraft-patches/features/0223-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0224-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch rename to leaf-server/minecraft-patches/features/0223-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch diff --git a/leaf-server/minecraft-patches/features/0225-Remove-streams-on-InsideBrownianWalk.patch b/leaf-server/minecraft-patches/features/0224-Remove-streams-on-InsideBrownianWalk.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0225-Remove-streams-on-InsideBrownianWalk.patch rename to leaf-server/minecraft-patches/features/0224-Remove-streams-on-InsideBrownianWalk.patch diff --git a/leaf-server/minecraft-patches/features/0226-Use-BFS-on-getSlopeDistance.patch b/leaf-server/minecraft-patches/features/0225-Use-BFS-on-getSlopeDistance.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0226-Use-BFS-on-getSlopeDistance.patch rename to leaf-server/minecraft-patches/features/0225-Use-BFS-on-getSlopeDistance.patch diff --git a/leaf-server/minecraft-patches/features/0227-Paper-PR-Throttle-failed-spawn-attempts.patch b/leaf-server/minecraft-patches/features/0226-Paper-PR-Throttle-failed-spawn-attempts.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0227-Paper-PR-Throttle-failed-spawn-attempts.patch rename to leaf-server/minecraft-patches/features/0226-Paper-PR-Throttle-failed-spawn-attempts.patch diff --git a/leaf-server/minecraft-patches/features/0228-Improve-BlockEntity-ticking-isRemoved-check.patch b/leaf-server/minecraft-patches/features/0227-Improve-BlockEntity-ticking-isRemoved-check.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0228-Improve-BlockEntity-ticking-isRemoved-check.patch rename to leaf-server/minecraft-patches/features/0227-Improve-BlockEntity-ticking-isRemoved-check.patch diff --git a/leaf-server/minecraft-patches/features/0229-Raytrace-AntiXray-SDK-integration.patch b/leaf-server/minecraft-patches/features/0228-Raytrace-AntiXray-SDK-integration.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0229-Raytrace-AntiXray-SDK-integration.patch rename to leaf-server/minecraft-patches/features/0228-Raytrace-AntiXray-SDK-integration.patch diff --git a/leaf-server/minecraft-patches/features/0230-Optimize-addOrUpdateTransientModifier.patch b/leaf-server/minecraft-patches/features/0229-Optimize-addOrUpdateTransientModifier.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0230-Optimize-addOrUpdateTransientModifier.patch rename to leaf-server/minecraft-patches/features/0229-Optimize-addOrUpdateTransientModifier.patch diff --git a/leaf-server/minecraft-patches/features/0231-Optimize-ContextMap.create.patch b/leaf-server/minecraft-patches/features/0230-Optimize-ContextMap.create.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0231-Optimize-ContextMap.create.patch rename to leaf-server/minecraft-patches/features/0230-Optimize-ContextMap.create.patch diff --git a/leaf-server/minecraft-patches/features/0232-Micro-optimizations-for-random-tick.patch b/leaf-server/minecraft-patches/features/0231-Micro-optimizations-for-random-tick.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0232-Micro-optimizations-for-random-tick.patch rename to leaf-server/minecraft-patches/features/0231-Micro-optimizations-for-random-tick.patch diff --git a/leaf-server/minecraft-patches/features/0233-Remove-streams-on-updateConnectedPlayersWithinRange.patch b/leaf-server/minecraft-patches/features/0232-Remove-streams-on-updateConnectedPlayersWithinRange.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0233-Remove-streams-on-updateConnectedPlayersWithinRange.patch rename to leaf-server/minecraft-patches/features/0232-Remove-streams-on-updateConnectedPlayersWithinRange.patch diff --git a/leaf-server/minecraft-patches/features/0234-Remove-streams-on-PlayerDetector.patch b/leaf-server/minecraft-patches/features/0233-Remove-streams-on-PlayerDetector.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0234-Remove-streams-on-PlayerDetector.patch rename to leaf-server/minecraft-patches/features/0233-Remove-streams-on-PlayerDetector.patch diff --git a/leaf-server/minecraft-patches/features/0235-Use-direct-iteration-on-Sensing.tick.patch b/leaf-server/minecraft-patches/features/0234-Use-direct-iteration-on-Sensing.tick.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0235-Use-direct-iteration-on-Sensing.tick.patch rename to leaf-server/minecraft-patches/features/0234-Use-direct-iteration-on-Sensing.tick.patch diff --git a/leaf-server/minecraft-patches/features/0236-Optimise-non-flush-packet-sending.patch b/leaf-server/minecraft-patches/features/0235-Optimise-non-flush-packet-sending.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0236-Optimise-non-flush-packet-sending.patch rename to leaf-server/minecraft-patches/features/0235-Optimise-non-flush-packet-sending.patch diff --git a/leaf-server/minecraft-patches/features/0237-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch b/leaf-server/minecraft-patches/features/0236-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0237-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch rename to leaf-server/minecraft-patches/features/0236-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch diff --git a/leaf-server/minecraft-patches/features/0238-Null-handling-on-MultifaceSpreader.patch b/leaf-server/minecraft-patches/features/0237-Null-handling-on-MultifaceSpreader.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0238-Null-handling-on-MultifaceSpreader.patch rename to leaf-server/minecraft-patches/features/0237-Null-handling-on-MultifaceSpreader.patch diff --git a/leaf-server/minecraft-patches/features/0239-More-virtual-threads.patch b/leaf-server/minecraft-patches/features/0238-More-virtual-threads.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0239-More-virtual-threads.patch rename to leaf-server/minecraft-patches/features/0238-More-virtual-threads.patch diff --git a/leaf-server/minecraft-patches/features/0240-Async-target-finding.patch b/leaf-server/minecraft-patches/features/0239-Async-target-finding.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0240-Async-target-finding.patch rename to leaf-server/minecraft-patches/features/0239-Async-target-finding.patch diff --git a/leaf-server/minecraft-patches/features/0241-Optimize-ThreadedTicketLevelPropagator.patch b/leaf-server/minecraft-patches/features/0240-Optimize-ThreadedTicketLevelPropagator.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0241-Optimize-ThreadedTicketLevelPropagator.patch rename to leaf-server/minecraft-patches/features/0240-Optimize-ThreadedTicketLevelPropagator.patch diff --git a/leaf-server/minecraft-patches/features/0242-Optimise-MobEffectUtil-getDigSpeedAmplification.patch b/leaf-server/minecraft-patches/features/0241-Optimise-MobEffectUtil-getDigSpeedAmplification.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0242-Optimise-MobEffectUtil-getDigSpeedAmplification.patch rename to leaf-server/minecraft-patches/features/0241-Optimise-MobEffectUtil-getDigSpeedAmplification.patch diff --git a/leaf-server/minecraft-patches/features/0243-Optimise-chunkUnloads.patch b/leaf-server/minecraft-patches/features/0242-Optimise-chunkUnloads.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0243-Optimise-chunkUnloads.patch rename to leaf-server/minecraft-patches/features/0242-Optimise-chunkUnloads.patch diff --git a/leaf-server/minecraft-patches/features/0244-Optimize-BlockEntityType-isValid.patch b/leaf-server/minecraft-patches/features/0243-Optimize-BlockEntityType-isValid.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0244-Optimize-BlockEntityType-isValid.patch rename to leaf-server/minecraft-patches/features/0243-Optimize-BlockEntityType-isValid.patch diff --git a/leaf-server/minecraft-patches/features/0245-PaperPR-Add-ticket-on-player-join-to-avoid-chunk-loa.patch b/leaf-server/minecraft-patches/features/0244-PaperPR-Add-ticket-on-player-join-to-avoid-chunk-loa.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0245-PaperPR-Add-ticket-on-player-join-to-avoid-chunk-loa.patch rename to leaf-server/minecraft-patches/features/0244-PaperPR-Add-ticket-on-player-join-to-avoid-chunk-loa.patch diff --git a/leaf-server/minecraft-patches/features/0246-Sakura-Optimise-check-inside-blocks-and-traverse-blo.patch b/leaf-server/minecraft-patches/features/0245-Sakura-Optimise-check-inside-blocks-and-traverse-blo.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0246-Sakura-Optimise-check-inside-blocks-and-traverse-blo.patch rename to leaf-server/minecraft-patches/features/0245-Sakura-Optimise-check-inside-blocks-and-traverse-blo.patch diff --git a/leaf-server/minecraft-patches/features/0247-Sakura-copy-EntityList-implementation-to-BasicEntity.patch b/leaf-server/minecraft-patches/features/0246-Sakura-copy-EntityList-implementation-to-BasicEntity.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0247-Sakura-copy-EntityList-implementation-to-BasicEntity.patch rename to leaf-server/minecraft-patches/features/0246-Sakura-copy-EntityList-implementation-to-BasicEntity.patch diff --git a/leaf-server/minecraft-patches/features/0248-Protocol-Core.patch b/leaf-server/minecraft-patches/features/0247-Protocol-Core.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0248-Protocol-Core.patch rename to leaf-server/minecraft-patches/features/0247-Protocol-Core.patch diff --git a/leaf-server/minecraft-patches/features/0249-Reduce-PlayerChunk-Updates.patch b/leaf-server/minecraft-patches/features/0248-Reduce-PlayerChunk-Updates.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0249-Reduce-PlayerChunk-Updates.patch rename to leaf-server/minecraft-patches/features/0248-Reduce-PlayerChunk-Updates.patch diff --git a/leaf-server/minecraft-patches/features/0250-Async-switch-connection-state.patch b/leaf-server/minecraft-patches/features/0249-Async-switch-connection-state.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0250-Async-switch-connection-state.patch rename to leaf-server/minecraft-patches/features/0249-Async-switch-connection-state.patch diff --git a/leaf-server/minecraft-patches/features/0251-Optimize-BlockEntities-tickersInLevel.patch b/leaf-server/minecraft-patches/features/0250-Optimize-BlockEntities-tickersInLevel.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0251-Optimize-BlockEntities-tickersInLevel.patch rename to leaf-server/minecraft-patches/features/0250-Optimize-BlockEntities-tickersInLevel.patch diff --git a/leaf-server/minecraft-patches/features/0252-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch b/leaf-server/minecraft-patches/features/0251-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0252-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch rename to leaf-server/minecraft-patches/features/0251-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch diff --git a/leaf-server/minecraft-patches/features/0253-Flush-location-while-knockback.patch b/leaf-server/minecraft-patches/features/0252-Flush-location-while-knockback.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0253-Flush-location-while-knockback.patch rename to leaf-server/minecraft-patches/features/0252-Flush-location-while-knockback.patch diff --git a/leaf-server/minecraft-patches/features/0254-Only-tick-items-at-hand.patch b/leaf-server/minecraft-patches/features/0253-Only-tick-items-at-hand.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0254-Only-tick-items-at-hand.patch rename to leaf-server/minecraft-patches/features/0253-Only-tick-items-at-hand.patch diff --git a/leaf-server/minecraft-patches/features/0255-Smart-sort-items-in-NearestItemSensor.patch b/leaf-server/minecraft-patches/features/0254-Smart-sort-items-in-NearestItemSensor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0255-Smart-sort-items-in-NearestItemSensor.patch rename to leaf-server/minecraft-patches/features/0254-Smart-sort-items-in-NearestItemSensor.patch diff --git a/leaf-server/minecraft-patches/features/0256-Optimise-player-movement-checks.patch b/leaf-server/minecraft-patches/features/0255-Optimise-player-movement-checks.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0256-Optimise-player-movement-checks.patch rename to leaf-server/minecraft-patches/features/0255-Optimise-player-movement-checks.patch diff --git a/leaf-server/minecraft-patches/features/0257-Remove-streams-in-MobSensor.patch b/leaf-server/minecraft-patches/features/0256-Remove-streams-in-MobSensor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0257-Remove-streams-in-MobSensor.patch rename to leaf-server/minecraft-patches/features/0256-Remove-streams-in-MobSensor.patch diff --git a/leaf-server/minecraft-patches/features/0258-Remove-streams-in-TemptingSensor.patch b/leaf-server/minecraft-patches/features/0257-Remove-streams-in-TemptingSensor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0258-Remove-streams-in-TemptingSensor.patch rename to leaf-server/minecraft-patches/features/0257-Remove-streams-in-TemptingSensor.patch diff --git a/leaf-server/minecraft-patches/features/0259-Use-HashedList-on-WeightedList.patch b/leaf-server/minecraft-patches/features/0258-Use-HashedList-on-WeightedList.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0259-Use-HashedList-on-WeightedList.patch rename to leaf-server/minecraft-patches/features/0258-Use-HashedList-on-WeightedList.patch diff --git a/leaf-server/minecraft-patches/features/0260-Add-configurable-death-item-drop-knockback-settings.patch b/leaf-server/minecraft-patches/features/0259-Add-configurable-death-item-drop-knockback-settings.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0260-Add-configurable-death-item-drop-knockback-settings.patch rename to leaf-server/minecraft-patches/features/0259-Add-configurable-death-item-drop-knockback-settings.patch diff --git a/leaf-server/minecraft-patches/features/0261-Optimize-getScaledTrackingDistance.patch b/leaf-server/minecraft-patches/features/0260-Optimize-getScaledTrackingDistance.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0261-Optimize-getScaledTrackingDistance.patch rename to leaf-server/minecraft-patches/features/0260-Optimize-getScaledTrackingDistance.patch diff --git a/leaf-server/minecraft-patches/features/0262-Optimize-SynchedEntityData-packDirty.patch b/leaf-server/minecraft-patches/features/0261-Optimize-SynchedEntityData-packDirty.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0262-Optimize-SynchedEntityData-packDirty.patch rename to leaf-server/minecraft-patches/features/0261-Optimize-SynchedEntityData-packDirty.patch diff --git a/leaf-server/minecraft-patches/features/0263-Optimize-isEyeInFluid.patch b/leaf-server/minecraft-patches/features/0262-Optimize-isEyeInFluid.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0263-Optimize-isEyeInFluid.patch rename to leaf-server/minecraft-patches/features/0262-Optimize-isEyeInFluid.patch diff --git a/leaf-server/minecraft-patches/features/0264-Cache-block-path-type.patch b/leaf-server/minecraft-patches/features/0263-Cache-block-path-type.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0264-Cache-block-path-type.patch rename to leaf-server/minecraft-patches/features/0263-Cache-block-path-type.patch diff --git a/leaf-server/minecraft-patches/features/0265-optimize-getEntityStatus.patch b/leaf-server/minecraft-patches/features/0264-optimize-getEntityStatus.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0265-optimize-getEntityStatus.patch rename to leaf-server/minecraft-patches/features/0264-optimize-getEntityStatus.patch diff --git a/leaf-server/minecraft-patches/features/0266-Paper-Rewrite-dataconverter-system.patch b/leaf-server/minecraft-patches/features/0265-Paper-Rewrite-dataconverter-system.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0266-Paper-Rewrite-dataconverter-system.patch rename to leaf-server/minecraft-patches/features/0265-Paper-Rewrite-dataconverter-system.patch diff --git a/leaf-server/minecraft-patches/features/0267-Rail-Optimization-optimized-PoweredRailBlock-logic.patch b/leaf-server/minecraft-patches/features/0266-Rail-Optimization-optimized-PoweredRailBlock-logic.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0267-Rail-Optimization-optimized-PoweredRailBlock-logic.patch rename to leaf-server/minecraft-patches/features/0266-Rail-Optimization-optimized-PoweredRailBlock-logic.patch diff --git a/leaf-server/minecraft-patches/features/0268-optimise-ChunkGenerator-getMobsAt.patch b/leaf-server/minecraft-patches/features/0267-optimise-ChunkGenerator-getMobsAt.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0268-optimise-ChunkGenerator-getMobsAt.patch rename to leaf-server/minecraft-patches/features/0267-optimise-ChunkGenerator-getMobsAt.patch diff --git a/leaf-server/minecraft-patches/features/0269-optimise-getBiome.patch b/leaf-server/minecraft-patches/features/0268-optimise-getBiome.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0269-optimise-getBiome.patch rename to leaf-server/minecraft-patches/features/0268-optimise-getBiome.patch diff --git a/leaf-server/minecraft-patches/features/0270-optimize-mob-spawning.patch b/leaf-server/minecraft-patches/features/0269-optimize-mob-spawning.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0270-optimize-mob-spawning.patch rename to leaf-server/minecraft-patches/features/0269-optimize-mob-spawning.patch diff --git a/leaf-server/minecraft-patches/features/0271-optimize-structure-map.patch b/leaf-server/minecraft-patches/features/0270-optimize-structure-map.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0271-optimize-structure-map.patch rename to leaf-server/minecraft-patches/features/0270-optimize-structure-map.patch diff --git a/leaf-server/minecraft-patches/features/0272-throttle-mob-spawning.patch b/leaf-server/minecraft-patches/features/0271-throttle-mob-spawning.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0272-throttle-mob-spawning.patch rename to leaf-server/minecraft-patches/features/0271-throttle-mob-spawning.patch diff --git a/leaf-server/minecraft-patches/features/0273-preload-mob-spawning-position.patch b/leaf-server/minecraft-patches/features/0272-preload-mob-spawning-position.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0273-preload-mob-spawning-position.patch rename to leaf-server/minecraft-patches/features/0272-preload-mob-spawning-position.patch diff --git a/leaf-server/minecraft-patches/features/0274-Add-BlockExplosionHitEvent.patch b/leaf-server/minecraft-patches/features/0273-Add-BlockExplosionHitEvent.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0274-Add-BlockExplosionHitEvent.patch rename to leaf-server/minecraft-patches/features/0273-Add-BlockExplosionHitEvent.patch diff --git a/leaf-server/minecraft-patches/features/0275-Old-Blast-Protection-explosion-knockback.patch b/leaf-server/minecraft-patches/features/0274-Old-Blast-Protection-explosion-knockback.patch similarity index 97% rename from leaf-server/minecraft-patches/features/0275-Old-Blast-Protection-explosion-knockback.patch rename to leaf-server/minecraft-patches/features/0274-Old-Blast-Protection-explosion-knockback.patch index aa08cc6d..db33c1a2 100644 --- a/leaf-server/minecraft-patches/features/0275-Old-Blast-Protection-explosion-knockback.patch +++ b/leaf-server/minecraft-patches/features/0274-Old-Blast-Protection-explosion-knockback.patch @@ -17,7 +17,7 @@ index dbf31389f0e9796c80afbffddf6a20cbaf184e6e..f1b456bf96e4764fd202f5575bbfa586 public static final StringRepresentable.EnumCodec CODEC = StringRepresentable.fromEnum(() -> VALUES_ARRAY); // Gale end - JettPack - reduce array allocations diff --git a/net/minecraft/world/level/ServerExplosion.java b/net/minecraft/world/level/ServerExplosion.java -index d73f58e7d65438c17a8ce11c5dbc9362145f152d..f9b957af7ca5e4511c76c0f8c138d142382993f3 100644 +index 33cd3a7755ada2fb632cfc97a80c8a9000ab0bd9..c67a9aa4431134ea25baf83a3ca9a646c8d8140d 100644 --- a/net/minecraft/world/level/ServerExplosion.java +++ b/net/minecraft/world/level/ServerExplosion.java @@ -529,7 +529,7 @@ public class ServerExplosion implements Explosion { diff --git a/leaf-server/minecraft-patches/features/0276-Paw-optimization.patch b/leaf-server/minecraft-patches/features/0275-Paw-optimization.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0276-Paw-optimization.patch rename to leaf-server/minecraft-patches/features/0275-Paw-optimization.patch diff --git a/leaf-server/minecraft-patches/features/0277-Use-UUID-for-cure-reputation.patch b/leaf-server/minecraft-patches/features/0276-Use-UUID-for-cure-reputation.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0277-Use-UUID-for-cure-reputation.patch rename to leaf-server/minecraft-patches/features/0276-Use-UUID-for-cure-reputation.patch index 328edd09..cc75c71e 100644 --- a/leaf-server/minecraft-patches/features/0277-Use-UUID-for-cure-reputation.patch +++ b/leaf-server/minecraft-patches/features/0276-Use-UUID-for-cure-reputation.patch @@ -21,7 +21,7 @@ index 70e68d56f2d781930d877f40818d9aeb377dc8af..2afe1c0a7670b52cf4ae13949b4f8c67 } diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java -index 63ce733ce78eb9bc630c497988949e18cbb56fe2..f163b3368853770ebac64b92ccde4e91e4511daa 100644 +index 92895a38c5ef7962db83e085a99c0b3766052541..bac09fcb62226c05f419abd63acb9191de9ec7f0 100644 --- a/net/minecraft/world/entity/npc/Villager.java +++ b/net/minecraft/world/entity/npc/Villager.java @@ -1093,6 +1093,21 @@ public class Villager extends AbstractVillager implements ReputationEventHandler diff --git a/leaf-server/minecraft-patches/features/0278-Cache-potential-behaviors-in-Brain.patch b/leaf-server/minecraft-patches/features/0277-Cache-potential-behaviors-in-Brain.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0278-Cache-potential-behaviors-in-Brain.patch rename to leaf-server/minecraft-patches/features/0277-Cache-potential-behaviors-in-Brain.patch diff --git a/leaf-server/minecraft-patches/features/0279-Use-ActivationList-on-runningBehaviors.patch b/leaf-server/minecraft-patches/features/0278-Use-ActivationList-on-runningBehaviors.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0279-Use-ActivationList-on-runningBehaviors.patch rename to leaf-server/minecraft-patches/features/0278-Use-ActivationList-on-runningBehaviors.patch diff --git a/leaf-server/minecraft-patches/features/0280-do-not-log-invalid-flatten-text-component-parse.patch b/leaf-server/minecraft-patches/features/0279-do-not-log-invalid-flatten-text-component-parse.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0280-do-not-log-invalid-flatten-text-component-parse.patch rename to leaf-server/minecraft-patches/features/0279-do-not-log-invalid-flatten-text-component-parse.patch