diff --git a/leaf-archived-patches/unapplied/server/minecraft-patches/gale-features/0010-Move-random-tick-random.patch b/leaf-server/minecraft-patches/features/0011-Move-random-tick-random.patch similarity index 83% rename from leaf-archived-patches/unapplied/server/minecraft-patches/gale-features/0010-Move-random-tick-random.patch rename to leaf-server/minecraft-patches/features/0011-Move-random-tick-random.patch index 8091b514..de2a02a9 100644 --- a/leaf-archived-patches/unapplied/server/minecraft-patches/gale-features/0010-Move-random-tick-random.patch +++ b/leaf-server/minecraft-patches/features/0011-Move-random-tick-random.patch @@ -19,10 +19,10 @@ require it to be initialized earlier. By moving it to the superclass, we initialize it earlier, ensuring that it is available sooner. diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index 93b0265e3b1ea133877682721ff28d735d9b688b..e43fa760210cb4c956b2143a65452eecf5f923f4 100644 +index 1d53c0b96ff781765155aac29256f4493f7d7c58..3941d15753aef952ad1fd5b5f96cb810f4f251e3 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java -@@ -841,8 +841,6 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -830,8 +830,6 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe } // Paper start - optimise random ticking @@ -32,15 +32,14 @@ index 93b0265e3b1ea133877682721ff28d735d9b688b..e43fa760210cb4c956b2143a65452eec final LevelChunkSection[] sections = chunk.getSections(); final int minSection = ca.spottedleaf.moonrise.common.util.WorldUtil.getMinSection((ServerLevel)(Object)this); diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java -index 73678ed00529af2369c66900c948de5fb46cc128..c4563e827a8333d57aabce1ff8e4c28d7e3a295b 100644 +index 9a5447dfa8cba271fdb205d21e4236c94074a7da..013e22dc4eceda9b947f1ff8fe43540b8855aa34 100644 --- a/net/minecraft/world/level/Level.java +++ b/net/minecraft/world/level/Level.java -@@ -181,6 +181,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl - public final Map explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions +@@ -168,6 +168,7 @@ public abstract class Level implements LevelAccessor, UUIDLookup, AutoCl + private int tileTickPosition; + public final Map explosionDensityCache = new java.util.HashMap<>(); // Paper - Optimize explosions public java.util.ArrayDeque redstoneUpdateInfos; // Paper - Faster redstone torch rapid clock removal; Move from Map in BlockRedstoneTorch to here - + public final ca.spottedleaf.moonrise.common.util.SimpleThreadUnsafeRandom simpleRandom = new ca.spottedleaf.moonrise.common.util.SimpleThreadUnsafeRandom(net.minecraft.world.level.levelgen.RandomSupport.generateUniqueSeed()); // Gale - Pufferfish - move random tick random -+ + public CraftWorld getWorld() { return this.world; - } diff --git a/leaf-archived-patches/unapplied/server/minecraft-patches/gale-features/0011-Optimize-random-calls-in-chunk-ticking.patch b/leaf-server/minecraft-patches/features/0012-Optimize-random-calls-in-chunk-ticking.patch similarity index 84% rename from leaf-archived-patches/unapplied/server/minecraft-patches/gale-features/0011-Optimize-random-calls-in-chunk-ticking.patch rename to leaf-server/minecraft-patches/features/0012-Optimize-random-calls-in-chunk-ticking.patch index 6bf96a73..b554ad69 100644 --- a/leaf-archived-patches/unapplied/server/minecraft-patches/gale-features/0011-Optimize-random-calls-in-chunk-ticking.patch +++ b/leaf-server/minecraft-patches/features/0012-Optimize-random-calls-in-chunk-ticking.patch @@ -52,22 +52,22 @@ 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/ServerChunkCache.java b/net/minecraft/server/level/ServerChunkCache.java -index 9500fc2f841819b0d40e8a6e48353bb28b6dbe49..5c8d76b80c6cefd87088282e59f5f0f72a4f1611 100644 +index 4167b46148fc370f20b35c2a261e38c0698855d4..52cef9fed4a68d16d89eabacbad073ead0685972 100644 --- a/net/minecraft/server/level/ServerChunkCache.java +++ b/net/minecraft/server/level/ServerChunkCache.java -@@ -495,6 +495,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon +@@ -499,6 +499,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon long l = gameTime - this.lastInhabitedUpdate; this.lastInhabitedUpdate = gameTime; if (!this.level.isDebug()) { + this.level.resetIceAndSnowTick(); // Gale - Airplane - optimize random calls in chunk ticking - reset ice & snow tick random if (this.level.tickRateManager().runsNormally()) { - List list = this.tickingChunks; - + this.tickChunks(l); // Gale - Purpur - remove vanilla profiler + } diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index e43fa760210cb4c956b2143a65452eecf5f923f4..b35fe7112f2ad94e85e98931c403b3ffa8608382 100644 +index 3941d15753aef952ad1fd5b5f96cb810f4f251e3..06439db58ecec0ead6c0a4e30357a9a3b3ebd120 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java -@@ -890,13 +890,15 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -879,13 +879,15 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe } // Paper end - optimise random ticking @@ -76,28 +76,28 @@ index e43fa760210cb4c956b2143a65452eecf5f923f4..b35fe7112f2ad94e85e98931c403b3ff public void tickChunk(LevelChunk chunk, int randomTickSpeed) { final ca.spottedleaf.moonrise.common.util.SimpleThreadUnsafeRandom simpleRandom = this.simpleRandom; // Paper - optimise random ticking ChunkPos pos = chunk.getPos(); - boolean isRaining = this.isRaining(); int minBlockX = pos.getMinBlockX(); int minBlockZ = pos.getMinBlockZ(); -- if (!this.paperConfig().environment.disableThunder && isRaining && this.isThundering() && this.spigotConfig.thunderChance > 0 && simpleRandom.nextInt(this.spigotConfig.thunderChance) == 0) { // Spigot // Paper - Option to disable thunder // Paper - optimise random ticking -+ if (!this.paperConfig().environment.disableThunder && isRaining && this.isThundering() && this.spigotConfig.thunderChance > 0 /*&& simpleRandom.nextInt(this.spigotConfig.thunderChance) == 0*/ && chunk.shouldDoLightning(this.random)) { // Spigot // Paper - Option to disable thunder // Paper - optimise random ticking // Gale - Airplane - optimize random calls in chunk ticking - replace random with shouldDoLightning - BlockPos blockPos = this.findLightningTargetAround(this.getBlockRandomPos(minBlockX, 0, minBlockZ, 15)); - if (this.isRainingAt(blockPos)) { - DifficultyInstance currentDifficultyAt = this.getCurrentDifficultyAt(blockPos); -@@ -922,7 +924,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe - } - } - if (!this.paperConfig().environment.disableIceAndSnow) { // Paper - Option to disable ice and snow + if (!this.paperConfig().environment.disableIceAndSnow && (this.currentIceAndSnowTick++ & 15) == 0) { // Paper - Option to disable ice and snow // Gale - Airplane - optimize random calls in chunk ticking - optimize further random ticking for (int i = 0; i < randomTickSpeed; i++) { if (simpleRandom.nextInt(48) == 0) { // Paper - optimise random ticking this.tickPrecipitation(this.getBlockRandomPos(minBlockX, 0, minBlockZ, 15)); +@@ -903,7 +905,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe + boolean isRaining = this.isRaining(); + int minBlockX = pos.getMinBlockX(); + int minBlockZ = pos.getMinBlockZ(); +- if (!this.paperConfig().environment.disableThunder && isRaining && this.isThundering() && this.spigotConfig.thunderChance > 0 && this.random.nextInt(this.spigotConfig.thunderChance) == 0) { // Spigot // Paper - Option to disable thunder ++ if (!this.paperConfig().environment.disableThunder && isRaining && this.isThundering() && this.spigotConfig.thunderChance > 0 /*&& this.random.nextInt(this.spigotConfig.thunderChance) == 0*/ && chunk.shouldDoLightning(this.random)) { // Spigot // Paper - Option to disable thunder // Gale - Airplane - optimize random calls in chunk ticking - replace random with shouldDoLightning + BlockPos blockPos = this.findLightningTargetAround(this.getBlockRandomPos(minBlockX, 0, minBlockZ, 15)); + if (this.isRainingAt(blockPos)) { + DifficultyInstance currentDifficultyAt = this.getCurrentDifficultyAt(blockPos); diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java -index 3a7707427691a7862499a7efa3b39ead1ef78013..95972e7d5e0357ff5884f1cb2f7596c5029f999d 100644 +index 61fa8f2bf018b8892a11acec058f36914c5a1573..a8db2a822deb07ddc707cf73fdc5c269d9842c06 100644 --- a/net/minecraft/world/level/chunk/LevelChunk.java +++ b/net/minecraft/world/level/chunk/LevelChunk.java -@@ -125,6 +125,18 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p +@@ -126,6 +126,18 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p } // Paper end - get block chunk optimisation @@ -116,7 +116,7 @@ index 3a7707427691a7862499a7efa3b39ead1ef78013..95972e7d5e0357ff5884f1cb2f7596c5 public LevelChunk(Level level, ChunkPos pos) { this(level, pos, UpgradeData.EMPTY, new LevelChunkTicks<>(), new LevelChunkTicks<>(), 0L, null, null, null); } -@@ -161,6 +173,8 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p +@@ -162,6 +174,8 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p this.debug = !empty && this.level.isDebug(); this.defaultBlockState = empty ? VOID_AIR_BLOCKSTATE : AIR_BLOCKSTATE; // Paper end - get block chunk optimisation diff --git a/leaf-server/minecraft-patches/features/0011-Reduce-enderman-teleport-chunk-lookups.patch b/leaf-server/minecraft-patches/features/0013-Reduce-enderman-teleport-chunk-lookups.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0011-Reduce-enderman-teleport-chunk-lookups.patch rename to leaf-server/minecraft-patches/features/0013-Reduce-enderman-teleport-chunk-lookups.patch diff --git a/leaf-server/minecraft-patches/features/0012-Reduce-acquire-POI-for-stuck-entities.patch b/leaf-server/minecraft-patches/features/0014-Reduce-acquire-POI-for-stuck-entities.patch similarity index 97% rename from leaf-server/minecraft-patches/features/0012-Reduce-acquire-POI-for-stuck-entities.patch rename to leaf-server/minecraft-patches/features/0014-Reduce-acquire-POI-for-stuck-entities.patch index 2b7ee927..5ae54663 100644 --- a/leaf-server/minecraft-patches/features/0012-Reduce-acquire-POI-for-stuck-entities.patch +++ b/leaf-server/minecraft-patches/features/0014-Reduce-acquire-POI-for-stuck-entities.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/world/entity/ai/behavior/AcquirePoi.java b/net/minecraft/world/entity/ai/behavior/AcquirePoi.java -index 9de13a78b2a8be181c02ab330bfa9abb936a83db..7470150b5c613ae31d94170d9f5eedac67add63d 100644 +index b9174ae7e3a3e2de2d570b95ab5012ac3c3a2eda..751e91a922b20c96f27885c3eb085ec4ae39091b 100644 --- a/net/minecraft/world/entity/ai/behavior/AcquirePoi.java +++ b/net/minecraft/world/entity/ai/behavior/AcquirePoi.java @@ -28,6 +28,13 @@ import org.apache.commons.lang3.mutable.MutableLong; diff --git a/leaf-server/minecraft-patches/features/0013-Check-targeting-range-before-getting-visibility.patch b/leaf-server/minecraft-patches/features/0015-Check-targeting-range-before-getting-visibility.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0013-Check-targeting-range-before-getting-visibility.patch rename to leaf-server/minecraft-patches/features/0015-Check-targeting-range-before-getting-visibility.patch diff --git a/leaf-server/minecraft-patches/features/0014-Cache-on-climbable-check.patch b/leaf-server/minecraft-patches/features/0016-Cache-on-climbable-check.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0014-Cache-on-climbable-check.patch rename to leaf-server/minecraft-patches/features/0016-Cache-on-climbable-check.patch diff --git a/leaf-server/minecraft-patches/features/0015-Make-EntityCollisionContext-a-live-representation.patch b/leaf-server/minecraft-patches/features/0017-Make-EntityCollisionContext-a-live-representation.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0015-Make-EntityCollisionContext-a-live-representation.patch rename to leaf-server/minecraft-patches/features/0017-Make-EntityCollisionContext-a-live-representation.patch diff --git a/leaf-server/minecraft-patches/features/0016-Better-checking-for-useless-move-packets.patch b/leaf-server/minecraft-patches/features/0018-Better-checking-for-useless-move-packets.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0016-Better-checking-for-useless-move-packets.patch rename to leaf-server/minecraft-patches/features/0018-Better-checking-for-useless-move-packets.patch diff --git a/leaf-server/minecraft-patches/features/0017-Block-goal-does-not-load-chunks.patch b/leaf-server/minecraft-patches/features/0019-Block-goal-does-not-load-chunks.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0017-Block-goal-does-not-load-chunks.patch rename to leaf-server/minecraft-patches/features/0019-Block-goal-does-not-load-chunks.patch diff --git a/leaf-server/minecraft-patches/features/0018-Reduce-entity-allocations.patch b/leaf-server/minecraft-patches/features/0020-Reduce-entity-allocations.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0018-Reduce-entity-allocations.patch rename to leaf-server/minecraft-patches/features/0020-Reduce-entity-allocations.patch diff --git a/leaf-server/minecraft-patches/features/0019-Remove-lambda-from-ticking-guard.patch b/leaf-server/minecraft-patches/features/0021-Remove-lambda-from-ticking-guard.patch similarity index 94% rename from leaf-server/minecraft-patches/features/0019-Remove-lambda-from-ticking-guard.patch rename to leaf-server/minecraft-patches/features/0021-Remove-lambda-from-ticking-guard.patch index d0c361e9..798a86f7 100644 --- a/leaf-server/minecraft-patches/features/0019-Remove-lambda-from-ticking-guard.patch +++ b/leaf-server/minecraft-patches/features/0021-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 1d53c0b96ff781765155aac29256f4493f7d7c58..45926483e727c5eb30969da461d2c5c0fa035e4a 100644 +index 06439db58ecec0ead6c0a4e30357a9a3b3ebd120..3cb0407c022c0b3e8627fc1d9736d3eee0609039 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,10 +56,10 @@ index 1d53c0b96ff781765155aac29256f4493f7d7c58..45926483e727c5eb30969da461d2c5c0 } } diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java -index 9a5447dfa8cba271fdb205d21e4236c94074a7da..906cca5e27d3aae3834075a635d2f6865f0ab64f 100644 +index 013e22dc4eceda9b947f1ff8fe43540b8855aa34..20403c3e2582caf3541cd9b051fb5ebff52eb555 100644 --- a/net/minecraft/world/level/Level.java +++ b/net/minecraft/world/level/Level.java -@@ -1488,10 +1488,10 @@ public abstract class Level implements LevelAccessor, UUIDLookup, AutoCl +@@ -1489,10 +1489,10 @@ public abstract class Level implements LevelAccessor, UUIDLookup, AutoCl final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level().getWorld().getName(), entity.getX(), entity.getY(), entity.getZ()); MinecraftServer.LOGGER.error(msg, var6); getCraftServer().getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerInternalException(msg, var6))); // Paper - ServerExceptionEvent diff --git a/leaf-server/minecraft-patches/features/0020-SIMD-support.patch b/leaf-server/minecraft-patches/features/0022-SIMD-support.patch similarity index 93% rename from leaf-server/minecraft-patches/features/0020-SIMD-support.patch rename to leaf-server/minecraft-patches/features/0022-SIMD-support.patch index 9ef594e7..31a68efc 100644 --- a/leaf-server/minecraft-patches/features/0020-SIMD-support.patch +++ b/leaf-server/minecraft-patches/features/0022-SIMD-support.patch @@ -13,7 +13,7 @@ As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java -index c71034e9077280ccd7b4d7a9986eb6ec1536472a..a86ede54cfeb416a8c0c85fe90862e65e6505b62 100644 +index 35f55d1830d7929d476a5377f0abc46fac5bfed1..1fc423f34b4731267e49326053443b90176e34d7 100644 --- a/net/minecraft/server/dedicated/DedicatedServer.java +++ b/net/minecraft/server/dedicated/DedicatedServer.java @@ -190,6 +190,13 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/leaf-server/minecraft-patches/features/0021-Make-book-writing-configurable.patch b/leaf-server/minecraft-patches/features/0023-Make-book-writing-configurable.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0021-Make-book-writing-configurable.patch rename to leaf-server/minecraft-patches/features/0023-Make-book-writing-configurable.patch diff --git a/leaf-server/minecraft-patches/features/0022-Reduce-in-wall-checks.patch b/leaf-server/minecraft-patches/features/0024-Reduce-in-wall-checks.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0022-Reduce-in-wall-checks.patch rename to leaf-server/minecraft-patches/features/0024-Reduce-in-wall-checks.patch diff --git a/leaf-server/minecraft-patches/features/0023-Make-chat-order-verification-configurable.patch b/leaf-server/minecraft-patches/features/0025-Make-chat-order-verification-configurable.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0023-Make-chat-order-verification-configurable.patch rename to leaf-server/minecraft-patches/features/0025-Make-chat-order-verification-configurable.patch diff --git a/leaf-server/minecraft-patches/features/0024-Make-ender-dragon-respawn-attempt-after-placing-end-.patch b/leaf-server/minecraft-patches/features/0026-Make-ender-dragon-respawn-attempt-after-placing-end-.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0024-Make-ender-dragon-respawn-attempt-after-placing-end-.patch rename to leaf-server/minecraft-patches/features/0026-Make-ender-dragon-respawn-attempt-after-placing-end-.patch diff --git a/leaf-server/minecraft-patches/features/0025-Make-saving-fireworks-configurable.patch b/leaf-server/minecraft-patches/features/0027-Make-saving-fireworks-configurable.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0025-Make-saving-fireworks-configurable.patch rename to leaf-server/minecraft-patches/features/0027-Make-saving-fireworks-configurable.patch diff --git a/leaf-server/minecraft-patches/features/0026-Reduce-hopper-item-checks.patch b/leaf-server/minecraft-patches/features/0028-Reduce-hopper-item-checks.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0026-Reduce-hopper-item-checks.patch rename to leaf-server/minecraft-patches/features/0028-Reduce-hopper-item-checks.patch diff --git a/leaf-server/minecraft-patches/features/0027-Reduce-villager-item-re-pickup.patch b/leaf-server/minecraft-patches/features/0029-Reduce-villager-item-re-pickup.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0027-Reduce-villager-item-re-pickup.patch rename to leaf-server/minecraft-patches/features/0029-Reduce-villager-item-re-pickup.patch diff --git a/leaf-server/minecraft-patches/features/0028-Variable-entity-wake-up-duration.patch b/leaf-server/minecraft-patches/features/0030-Variable-entity-wake-up-duration.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0028-Variable-entity-wake-up-duration.patch rename to leaf-server/minecraft-patches/features/0030-Variable-entity-wake-up-duration.patch diff --git a/leaf-server/minecraft-patches/features/0029-Do-not-process-chat-commands-before-player-has-joine.patch b/leaf-server/minecraft-patches/features/0031-Do-not-process-chat-commands-before-player-has-joine.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0029-Do-not-process-chat-commands-before-player-has-joine.patch rename to leaf-server/minecraft-patches/features/0031-Do-not-process-chat-commands-before-player-has-joine.patch diff --git a/leaf-server/minecraft-patches/features/0030-Do-not-log-invalid-statistics.patch b/leaf-server/minecraft-patches/features/0032-Do-not-log-invalid-statistics.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0030-Do-not-log-invalid-statistics.patch rename to leaf-server/minecraft-patches/features/0032-Do-not-log-invalid-statistics.patch diff --git a/leaf-server/minecraft-patches/features/0031-Do-not-log-empty-message-warnings.patch b/leaf-server/minecraft-patches/features/0033-Do-not-log-empty-message-warnings.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0031-Do-not-log-empty-message-warnings.patch rename to leaf-server/minecraft-patches/features/0033-Do-not-log-empty-message-warnings.patch diff --git a/leaf-server/minecraft-patches/features/0032-Do-not-log-ignored-advancements.patch b/leaf-server/minecraft-patches/features/0034-Do-not-log-ignored-advancements.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0032-Do-not-log-ignored-advancements.patch rename to leaf-server/minecraft-patches/features/0034-Do-not-log-ignored-advancements.patch diff --git a/leaf-server/minecraft-patches/features/0033-Do-not-log-setBlock-in-far-chunks.patch b/leaf-server/minecraft-patches/features/0035-Do-not-log-setBlock-in-far-chunks.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0033-Do-not-log-setBlock-in-far-chunks.patch rename to leaf-server/minecraft-patches/features/0035-Do-not-log-setBlock-in-far-chunks.patch diff --git a/leaf-server/minecraft-patches/features/0034-Do-not-log-unrecognized-recipes.patch b/leaf-server/minecraft-patches/features/0036-Do-not-log-unrecognized-recipes.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0034-Do-not-log-unrecognized-recipes.patch rename to leaf-server/minecraft-patches/features/0036-Do-not-log-unrecognized-recipes.patch diff --git a/leaf-server/minecraft-patches/features/0035-Do-not-log-expired-message-warnings.patch b/leaf-server/minecraft-patches/features/0037-Do-not-log-expired-message-warnings.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0035-Do-not-log-expired-message-warnings.patch rename to leaf-server/minecraft-patches/features/0037-Do-not-log-expired-message-warnings.patch diff --git a/leaf-server/minecraft-patches/features/0036-Do-not-log-Not-Secure-marker.patch b/leaf-server/minecraft-patches/features/0038-Do-not-log-Not-Secure-marker.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0036-Do-not-log-Not-Secure-marker.patch rename to leaf-server/minecraft-patches/features/0038-Do-not-log-Not-Secure-marker.patch diff --git a/leaf-server/minecraft-patches/features/0037-Do-not-log-disconnections-with-null-id.patch b/leaf-server/minecraft-patches/features/0039-Do-not-log-disconnections-with-null-id.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0037-Do-not-log-disconnections-with-null-id.patch rename to leaf-server/minecraft-patches/features/0039-Do-not-log-disconnections-with-null-id.patch diff --git a/leaf-server/minecraft-patches/features/0038-Do-not-log-run-as-root-warning.patch b/leaf-server/minecraft-patches/features/0040-Do-not-log-run-as-root-warning.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0038-Do-not-log-run-as-root-warning.patch rename to leaf-server/minecraft-patches/features/0040-Do-not-log-run-as-root-warning.patch index 2c1ea3c1..e827b480 100644 --- a/leaf-server/minecraft-patches/features/0038-Do-not-log-run-as-root-warning.patch +++ b/leaf-server/minecraft-patches/features/0040-Do-not-log-run-as-root-warning.patch @@ -41,7 +41,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java -index a86ede54cfeb416a8c0c85fe90862e65e6505b62..65fa22ea82076542d42d651227e5332692981cc3 100644 +index 1fc423f34b4731267e49326053443b90176e34d7..083e0154ec373d5ebe18ecbe55c88e4407d61a81 100644 --- a/net/minecraft/server/dedicated/DedicatedServer.java +++ b/net/minecraft/server/dedicated/DedicatedServer.java @@ -142,7 +142,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/leaf-server/minecraft-patches/features/0039-Do-not-log-offline-mode-warning.patch b/leaf-server/minecraft-patches/features/0041-Do-not-log-offline-mode-warning.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0039-Do-not-log-offline-mode-warning.patch rename to leaf-server/minecraft-patches/features/0041-Do-not-log-offline-mode-warning.patch index f22fedbd..466f2567 100644 --- a/leaf-server/minecraft-patches/features/0039-Do-not-log-offline-mode-warning.patch +++ b/leaf-server/minecraft-patches/features/0041-Do-not-log-offline-mode-warning.patch @@ -41,7 +41,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java -index 65fa22ea82076542d42d651227e5332692981cc3..a880ace4cfc64ea8359f08938f20294ec936ba9c 100644 +index 083e0154ec373d5ebe18ecbe55c88e4407d61a81..cd266af35c7b8455af19adc9b0874cdd7572217f 100644 --- a/net/minecraft/server/dedicated/DedicatedServer.java +++ b/net/minecraft/server/dedicated/DedicatedServer.java @@ -253,7 +253,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/leaf-server/minecraft-patches/features/0040-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/leaf-server/minecraft-patches/features/0042-Fix-outdated-server-showing-in-ping-before-server-fu.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0040-Fix-outdated-server-showing-in-ping-before-server-fu.patch rename to leaf-server/minecraft-patches/features/0042-Fix-outdated-server-showing-in-ping-before-server-fu.patch diff --git a/leaf-server/minecraft-patches/features/0041-Fix-MC-238526.patch b/leaf-server/minecraft-patches/features/0043-Fix-MC-238526.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0041-Fix-MC-238526.patch rename to leaf-server/minecraft-patches/features/0043-Fix-MC-238526.patch diff --git a/leaf-server/minecraft-patches/features/0042-Fix-MC-121706.patch b/leaf-server/minecraft-patches/features/0044-Fix-MC-121706.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0042-Fix-MC-121706.patch rename to leaf-server/minecraft-patches/features/0044-Fix-MC-121706.patch diff --git a/leaf-server/minecraft-patches/features/0043-Make-arrow-movement-resetting-despawn-counter-config.patch b/leaf-server/minecraft-patches/features/0045-Make-arrow-movement-resetting-despawn-counter-config.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0043-Make-arrow-movement-resetting-despawn-counter-config.patch rename to leaf-server/minecraft-patches/features/0045-Make-arrow-movement-resetting-despawn-counter-config.patch diff --git a/leaf-server/minecraft-patches/features/0044-Make-logging-login-locations-configurable.patch b/leaf-server/minecraft-patches/features/0046-Make-logging-login-locations-configurable.patch similarity index 95% rename from leaf-server/minecraft-patches/features/0044-Make-logging-login-locations-configurable.patch rename to leaf-server/minecraft-patches/features/0046-Make-logging-login-locations-configurable.patch index 153451a3..c88e0630 100644 --- a/leaf-server/minecraft-patches/features/0044-Make-logging-login-locations-configurable.patch +++ b/leaf-server/minecraft-patches/features/0046-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 5abc0655ffc68ce81248467e7420051b2a2f0359..029003ccbd4820b60369894b2c3d4bd47f697d93 100644 +index 29904ffc7aa1b60ceb94cd2e4f7c86d26e398e6c..2bfff6cc34bc94402fb349d2641efadf380c241a 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/0045-Reduce-array-allocations.patch b/leaf-server/minecraft-patches/features/0047-Reduce-array-allocations.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0045-Reduce-array-allocations.patch rename to leaf-server/minecraft-patches/features/0047-Reduce-array-allocations.patch index 87fd352f..7feb3b26 100644 --- a/leaf-server/minecraft-patches/features/0045-Reduce-array-allocations.patch +++ b/leaf-server/minecraft-patches/features/0047-Reduce-array-allocations.patch @@ -80,7 +80,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 eb2a6b82dc38989bcc155281aaafaced6fce78a0..866671513a598737cb618d149a96eecce5e36184 100644 +index 3cb0407c022c0b3e8627fc1d9736d3eee0609039..609b3020e5c044c51d80680bb0e9f3caae5b8285 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 diff --git a/leaf-server/minecraft-patches/features/0046-Optimize-sun-burn-tick.patch b/leaf-server/minecraft-patches/features/0048-Optimize-sun-burn-tick.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0046-Optimize-sun-burn-tick.patch rename to leaf-server/minecraft-patches/features/0048-Optimize-sun-burn-tick.patch diff --git a/leaf-server/minecraft-patches/features/0047-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/leaf-server/minecraft-patches/features/0049-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0047-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to leaf-server/minecraft-patches/features/0049-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/leaf-server/minecraft-patches/features/0048-Replace-game-rules-map-with-optimized-collection.patch b/leaf-server/minecraft-patches/features/0050-Replace-game-rules-map-with-optimized-collection.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0048-Replace-game-rules-map-with-optimized-collection.patch rename to leaf-server/minecraft-patches/features/0050-Replace-game-rules-map-with-optimized-collection.patch diff --git a/leaf-server/minecraft-patches/features/0049-Replace-AI-attributes-with-optimized-collections.patch b/leaf-server/minecraft-patches/features/0051-Replace-AI-attributes-with-optimized-collections.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0049-Replace-AI-attributes-with-optimized-collections.patch rename to leaf-server/minecraft-patches/features/0051-Replace-AI-attributes-with-optimized-collections.patch diff --git a/leaf-server/minecraft-patches/features/0050-Replace-class-map-with-optimized-collection.patch b/leaf-server/minecraft-patches/features/0052-Replace-class-map-with-optimized-collection.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0050-Replace-class-map-with-optimized-collection.patch rename to leaf-server/minecraft-patches/features/0052-Replace-class-map-with-optimized-collection.patch diff --git a/leaf-server/minecraft-patches/features/0051-Replace-instance-list-with-optimized-collection.patch b/leaf-server/minecraft-patches/features/0053-Replace-instance-list-with-optimized-collection.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0051-Replace-instance-list-with-optimized-collection.patch rename to leaf-server/minecraft-patches/features/0053-Replace-instance-list-with-optimized-collection.patch diff --git a/leaf-server/minecraft-patches/features/0052-Replace-throttle-tracker-map-with-optimized-collecti.patch b/leaf-server/minecraft-patches/features/0054-Replace-throttle-tracker-map-with-optimized-collecti.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0052-Replace-throttle-tracker-map-with-optimized-collecti.patch rename to leaf-server/minecraft-patches/features/0054-Replace-throttle-tracker-map-with-optimized-collecti.patch diff --git a/leaf-server/minecraft-patches/features/0053-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/leaf-server/minecraft-patches/features/0055-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0053-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to leaf-server/minecraft-patches/features/0055-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/leaf-server/minecraft-patches/features/0054-Cache-BlockStatePairKey-hash.patch b/leaf-server/minecraft-patches/features/0056-Cache-BlockStatePairKey-hash.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0054-Cache-BlockStatePairKey-hash.patch rename to leaf-server/minecraft-patches/features/0056-Cache-BlockStatePairKey-hash.patch diff --git a/leaf-server/minecraft-patches/features/0055-Cache-ShapePairKey-hash.patch b/leaf-server/minecraft-patches/features/0057-Cache-ShapePairKey-hash.patch similarity index 94% rename from leaf-server/minecraft-patches/features/0055-Cache-ShapePairKey-hash.patch rename to leaf-server/minecraft-patches/features/0057-Cache-ShapePairKey-hash.patch index 63bac58f..fd92b699 100644 --- a/leaf-server/minecraft-patches/features/0055-Cache-ShapePairKey-hash.patch +++ b/leaf-server/minecraft-patches/features/0057-Cache-ShapePairKey-hash.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Cache ShapePairKey hash diff --git a/net/minecraft/world/level/block/Block.java b/net/minecraft/world/level/block/Block.java -index 95bd1139401d49ddf443a64faca8cd30ca3b1a1d..b545ec55430105f74a09d6ae81d4cdc198121f17 100644 +index ae3e6e31171b1bcfba1ae51a0941b52dda270acd..064e08e28acf7497e950d4e7f6ad7bddd92418b4 100644 --- a/net/minecraft/world/level/block/Block.java +++ b/net/minecraft/world/level/block/Block.java @@ -610,7 +610,20 @@ public class Block extends BlockBehaviour implements ItemLike { diff --git a/leaf-server/minecraft-patches/features/0056-Replace-division-by-multiplication-in-CubePointRange.patch b/leaf-server/minecraft-patches/features/0058-Replace-division-by-multiplication-in-CubePointRange.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0056-Replace-division-by-multiplication-in-CubePointRange.patch rename to leaf-server/minecraft-patches/features/0058-Replace-division-by-multiplication-in-CubePointRange.patch diff --git a/leaf-server/minecraft-patches/features/0057-Replace-parts-by-size-in-CubePointRange.patch b/leaf-server/minecraft-patches/features/0059-Replace-parts-by-size-in-CubePointRange.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0057-Replace-parts-by-size-in-CubePointRange.patch rename to leaf-server/minecraft-patches/features/0059-Replace-parts-by-size-in-CubePointRange.patch diff --git a/leaf-server/minecraft-patches/features/0058-Check-frozen-ticks-before-landing-block.patch b/leaf-server/minecraft-patches/features/0060-Check-frozen-ticks-before-landing-block.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0058-Check-frozen-ticks-before-landing-block.patch rename to leaf-server/minecraft-patches/features/0060-Check-frozen-ticks-before-landing-block.patch diff --git a/leaf-server/minecraft-patches/features/0059-Faster-chunk-serialization.patch b/leaf-server/minecraft-patches/features/0061-Faster-chunk-serialization.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0059-Faster-chunk-serialization.patch rename to leaf-server/minecraft-patches/features/0061-Faster-chunk-serialization.patch diff --git a/leaf-server/minecraft-patches/features/0060-Update-boss-bar-within-tick.patch b/leaf-server/minecraft-patches/features/0062-Update-boss-bar-within-tick.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0060-Update-boss-bar-within-tick.patch rename to leaf-server/minecraft-patches/features/0062-Update-boss-bar-within-tick.patch diff --git a/leaf-server/minecraft-patches/features/0061-Skip-secondary-POI-sensor-if-absent.patch b/leaf-server/minecraft-patches/features/0063-Skip-secondary-POI-sensor-if-absent.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0061-Skip-secondary-POI-sensor-if-absent.patch rename to leaf-server/minecraft-patches/features/0063-Skip-secondary-POI-sensor-if-absent.patch diff --git a/leaf-server/minecraft-patches/features/0062-Skip-entity-move-if-movement-is-zero.patch b/leaf-server/minecraft-patches/features/0064-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0062-Skip-entity-move-if-movement-is-zero.patch rename to leaf-server/minecraft-patches/features/0064-Skip-entity-move-if-movement-is-zero.patch diff --git a/leaf-server/minecraft-patches/features/0063-Store-mob-counts-in-an-array.patch b/leaf-server/minecraft-patches/features/0065-Store-mob-counts-in-an-array.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0063-Store-mob-counts-in-an-array.patch rename to leaf-server/minecraft-patches/features/0065-Store-mob-counts-in-an-array.patch diff --git a/leaf-server/minecraft-patches/features/0064-Use-linked-map-for-entity-trackers.patch b/leaf-server/minecraft-patches/features/0066-Use-linked-map-for-entity-trackers.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0064-Use-linked-map-for-entity-trackers.patch rename to leaf-server/minecraft-patches/features/0066-Use-linked-map-for-entity-trackers.patch diff --git a/leaf-server/minecraft-patches/features/0065-Optimize-noise-generation.patch b/leaf-server/minecraft-patches/features/0067-Optimize-noise-generation.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0065-Optimize-noise-generation.patch rename to leaf-server/minecraft-patches/features/0067-Optimize-noise-generation.patch diff --git a/leaf-server/minecraft-patches/features/0066-Optimize-sheep-offspring-color.patch b/leaf-server/minecraft-patches/features/0068-Optimize-sheep-offspring-color.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0066-Optimize-sheep-offspring-color.patch rename to leaf-server/minecraft-patches/features/0068-Optimize-sheep-offspring-color.patch diff --git a/leaf-server/minecraft-patches/features/0067-Hide-flames-on-entities-with-fire-resistance.patch b/leaf-server/minecraft-patches/features/0069-Hide-flames-on-entities-with-fire-resistance.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0067-Hide-flames-on-entities-with-fire-resistance.patch rename to leaf-server/minecraft-patches/features/0069-Hide-flames-on-entities-with-fire-resistance.patch diff --git a/leaf-server/minecraft-patches/features/0068-Skip-cloning-advancement-criteria.patch b/leaf-server/minecraft-patches/features/0070-Skip-cloning-advancement-criteria.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0068-Skip-cloning-advancement-criteria.patch rename to leaf-server/minecraft-patches/features/0070-Skip-cloning-advancement-criteria.patch diff --git a/leaf-server/minecraft-patches/features/0069-Reduce-block-destruction-packet-allocations.patch b/leaf-server/minecraft-patches/features/0071-Reduce-block-destruction-packet-allocations.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0069-Reduce-block-destruction-packet-allocations.patch rename to leaf-server/minecraft-patches/features/0071-Reduce-block-destruction-packet-allocations.patch index 35dc126c..a11e051b 100644 --- a/leaf-server/minecraft-patches/features/0069-Reduce-block-destruction-packet-allocations.patch +++ b/leaf-server/minecraft-patches/features/0071-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 866671513a598737cb618d149a96eecce5e36184..0531622d5f21bf82eef6dc7614765085388f3978 100644 +index 609b3020e5c044c51d80680bb0e9f3caae5b8285..7c7be7c533fe9d2047e7695859849f7f016c7929 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/0070-Spread-out-sending-all-player-info.patch b/leaf-server/minecraft-patches/features/0072-Spread-out-sending-all-player-info.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0070-Spread-out-sending-all-player-info.patch rename to leaf-server/minecraft-patches/features/0072-Spread-out-sending-all-player-info.patch diff --git a/leaf-server/minecraft-patches/features/0071-Optimize-player-list-for-sending-player-info.patch b/leaf-server/minecraft-patches/features/0073-Optimize-player-list-for-sending-player-info.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0071-Optimize-player-list-for-sending-player-info.patch rename to leaf-server/minecraft-patches/features/0073-Optimize-player-list-for-sending-player-info.patch diff --git a/leaf-server/minecraft-patches/features/0072-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/leaf-server/minecraft-patches/features/0074-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0072-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to leaf-server/minecraft-patches/features/0074-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/leaf-server/minecraft-patches/features/0073-Send-multiple-keep-alive-packets.patch b/leaf-server/minecraft-patches/features/0075-Send-multiple-keep-alive-packets.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0073-Send-multiple-keep-alive-packets.patch rename to leaf-server/minecraft-patches/features/0075-Send-multiple-keep-alive-packets.patch diff --git a/leaf-server/minecraft-patches/features/0074-Make-slow-login-timeout-configurable.patch b/leaf-server/minecraft-patches/features/0076-Make-slow-login-timeout-configurable.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0074-Make-slow-login-timeout-configurable.patch rename to leaf-server/minecraft-patches/features/0076-Make-slow-login-timeout-configurable.patch diff --git a/leaf-server/minecraft-patches/features/0075-Don-t-load-chunks-to-spawn-phantoms.patch b/leaf-server/minecraft-patches/features/0077-Don-t-load-chunks-to-spawn-phantoms.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0075-Don-t-load-chunks-to-spawn-phantoms.patch rename to leaf-server/minecraft-patches/features/0077-Don-t-load-chunks-to-spawn-phantoms.patch diff --git a/leaf-server/minecraft-patches/features/0076-Don-t-load-chunks-to-activate-climbing-entities.patch b/leaf-server/minecraft-patches/features/0078-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0076-Don-t-load-chunks-to-activate-climbing-entities.patch rename to leaf-server/minecraft-patches/features/0078-Don-t-load-chunks-to-activate-climbing-entities.patch diff --git a/leaf-server/minecraft-patches/features/0077-Broadcast-crit-animations-as-the-entity-being-critte.patch b/leaf-server/minecraft-patches/features/0079-Broadcast-crit-animations-as-the-entity-being-critte.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0077-Broadcast-crit-animations-as-the-entity-being-critte.patch rename to leaf-server/minecraft-patches/features/0079-Broadcast-crit-animations-as-the-entity-being-critte.patch diff --git a/leaf-server/minecraft-patches/features/0078-Ignore-null-legacy-structure-data.patch b/leaf-server/minecraft-patches/features/0080-Ignore-null-legacy-structure-data.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0078-Ignore-null-legacy-structure-data.patch rename to leaf-server/minecraft-patches/features/0080-Ignore-null-legacy-structure-data.patch diff --git a/leaf-server/minecraft-patches/features/0079-Prevent-entities-random-strolling-into-non-ticking-c.patch b/leaf-server/minecraft-patches/features/0081-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0079-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to leaf-server/minecraft-patches/features/0081-Prevent-entities-random-strolling-into-non-ticking-c.patch diff --git a/leaf-server/minecraft-patches/features/0080-Do-not-place-player-in-world-if-kicked-before-being-.patch b/leaf-server/minecraft-patches/features/0082-Do-not-place-player-in-world-if-kicked-before-being-.patch similarity index 94% rename from leaf-server/minecraft-patches/features/0080-Do-not-place-player-in-world-if-kicked-before-being-.patch rename to leaf-server/minecraft-patches/features/0082-Do-not-place-player-in-world-if-kicked-before-being-.patch index ee66268e..cad35446 100644 --- a/leaf-server/minecraft-patches/features/0080-Do-not-place-player-in-world-if-kicked-before-being-.patch +++ b/leaf-server/minecraft-patches/features/0082-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 cab616d4e088a41152423ce4e3ba643876341384..e62f24dcdc5f09ce9c316615f2c67778570bcc6e 100644 +index 0c80d22ac19e8507a54e3ea0b3df5fa5ee853f89..11015e8c0f2b5f8bd2eb083d8e093beb72c43cf0 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/0081-Global-EULA-file.patch b/leaf-server/minecraft-patches/features/0083-Global-EULA-file.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0081-Global-EULA-file.patch rename to leaf-server/minecraft-patches/features/0083-Global-EULA-file.patch diff --git a/leaf-server/minecraft-patches/features/0082-5-second-TPS-average.patch b/leaf-server/minecraft-patches/features/0084-5-second-TPS-average.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0082-5-second-TPS-average.patch rename to leaf-server/minecraft-patches/features/0084-5-second-TPS-average.patch index 26cde3bc..7c5eceb8 100644 --- a/leaf-server/minecraft-patches/features/0082-5-second-TPS-average.patch +++ b/leaf-server/minecraft-patches/features/0084-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 20fd5ea3922b93a00e4f55cfd33af1ce3363e09a..c26db575eb421115cc236f553e47871bcf9cf11f 100644 +index 2505000585f6b726914861faf8f731bd7e83a34a..660107ce94c6d0a03a0da11b72795ec89434351f 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -1091,6 +1091,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop blockTicks; private final LevelChunkTicks fluidTicks; private LevelChunk.UnsavedListener unsavedListener = chunkPos -> {}; -@@ -143,7 +155,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p +@@ -155,7 +167,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p ) { super(pos, data, level, net.minecraft.server.MinecraftServer.getServer().registryAccess().lookupOrThrow(Registries.BIOME), inhabitedTime, sections, blendingData); // Paper - Anti-Xray - The world isn't ready yet, use server singleton for registry this.level = (ServerLevel) level; // CraftBukkit - type @@ -71,7 +71,7 @@ index 61fa8f2bf018b8892a11acec058f36914c5a1573..54322b76e59f749ea9bbe6a8e0bfa78b for (Heightmap.Types types : Heightmap.Types.values()) { if (ChunkStatus.FULL.heightmapsAfter().contains(types)) { -@@ -253,10 +265,27 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p +@@ -267,10 +279,27 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p @Override public GameEventListenerRegistry getListenerRegistry(int sectionY) { @@ -103,7 +103,7 @@ index 61fa8f2bf018b8892a11acec058f36914c5a1573..54322b76e59f749ea9bbe6a8e0bfa78b } // Paper start - Perf: Reduce instructions and provide final method -@@ -603,7 +632,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p +@@ -617,7 +646,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p } private void removeGameEventListenerRegistry(int sectionY) { diff --git a/leaf-server/minecraft-patches/features/0109-Reduce-canSee-work.patch b/leaf-server/minecraft-patches/features/0111-Reduce-canSee-work.patch similarity index 92% rename from leaf-server/minecraft-patches/features/0109-Reduce-canSee-work.patch rename to leaf-server/minecraft-patches/features/0111-Reduce-canSee-work.patch index 02064ea7..d2e8f966 100644 --- a/leaf-server/minecraft-patches/features/0109-Reduce-canSee-work.patch +++ b/leaf-server/minecraft-patches/features/0111-Reduce-canSee-work.patch @@ -7,10 +7,10 @@ Co-authored by: Martijn Muijsers Co-authored by: MachineBreaker diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java -index 906cca5e27d3aae3834075a635d2f6865f0ab64f..8a9516025cf6569d57ca48693bb34dd7a96c2420 100644 +index 20403c3e2582caf3541cd9b051fb5ebff52eb555..d56283aaf6726a5d71fb89f2c059db76c211d402 100644 --- a/net/minecraft/world/level/Level.java +++ b/net/minecraft/world/level/Level.java -@@ -941,17 +941,19 @@ public abstract class Level implements LevelAccessor, UUIDLookup, AutoCl +@@ -942,17 +942,19 @@ public abstract class Level implements LevelAccessor, UUIDLookup, AutoCl for (int i = 0, len = entities.size(); i < len; ++i) { Entity entity = entities.get(i); diff --git a/leaf-server/minecraft-patches/features/0110-Fix-sprint-glitch.patch b/leaf-server/minecraft-patches/features/0112-Fix-sprint-glitch.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0110-Fix-sprint-glitch.patch rename to leaf-server/minecraft-patches/features/0112-Fix-sprint-glitch.patch