diff --git a/build.gradle.kts b/build.gradle.kts index 366178c..53f3e30 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,5 @@ -import io.papermc.paperweight.tasks.CollectATsFromPatches +import org.gradle.api.tasks.testing.logging.TestExceptionFormat +import org.gradle.api.tasks.testing.logging.TestLogEvent import io.papermc.paperweight.util.path import org.gradle.configurationcache.extensions.capitalized import kotlin.io.path.deleteRecursively @@ -8,22 +9,6 @@ plugins { `maven-publish` id("com.github.johnrengelman.shadow") version "8.1.1" apply false id("io.papermc.paperweight.patcher") version "1.5.5" - id("com.github.ManifestClasspath") version "0.1.0-RELEASE" -} - -val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" - -repositories { - mavenCentral() - maven(paperMavenPublicUrl) { - content { onlyForConfigurations(configurations.paperclip.name) } - } -} - -dependencies { - remapper("net.fabricmc:tiny-remapper:0.8.6:fat") - decompiler("net.minecraftforge:forgeflower:2.0.627.2") - paperclip("io.papermc:paperclip:3.0.3") } allprojects { @@ -37,8 +22,10 @@ allprojects { } } +val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" + subprojects { - tasks.withType { + tasks.withType().configureEach { options.encoding = Charsets.UTF_8.name() options.release.set(17) } @@ -48,6 +35,13 @@ subprojects { tasks.withType { filteringCharset = Charsets.UTF_8.name() } + tasks.withType { + testLogging { + showStackTraces = true + exceptionFormat = TestExceptionFormat.FULL + events(TestLogEvent.STANDARD_OUT) + } + } repositories { mavenCentral() @@ -55,6 +49,21 @@ subprojects { } } +repositories { + mavenCentral() + maven(paperMavenPublicUrl) { + content { + onlyForConfigurations(configurations.paperclip.name) + } + } +} + +dependencies { + remapper("net.fabricmc:tiny-remapper:0.8.6:fat") + decompiler("net.minecraftforge:forgeflower:2.0.627.2") + paperclip("io.papermc:paperclip:3.0.3") +} + paperweight { serverProject.set(project(":gale-server")) // Gale - build changes @@ -73,9 +82,24 @@ paperweight { } // Uncomment while updating for a new Minecraft version -//tasks.withType { +//tasks.withType { // extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server")) //} +// tasks.withType { +// filterPatches.set(false) +// } + +tasks.register("printMinecraftVersion") { + doLast { + println(providers.gradleProperty("mcVersion").get().trim()) + } +} + +tasks.register("printGaleVersion") { // Gale - branding changes + doLast { + println(project.version) + } +} // Gale start - branding changes - package license into jar for (classifier in arrayOf("mojmap", "reobf")) { diff --git a/gradle.properties b/gradle.properties index 2eae803..e08ea16 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=org.galemc.gale version=1.20.1-R0.1-SNAPSHOT mcVersion=1.20.1 -paperRef=b4e3b3d1dd447bac4cbf478595c1ec320bc6dd4b +paperRef=29d1c7b60244bb002d29a5dcfc9c995019f550ab org.gradle.caching=true org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ccebba7..7f93135 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/patches/server/0008-Gale-semantic-version.patch b/patches/server/0008-Gale-semantic-version.patch index a9ad35b..3a49c40 100644 --- a/patches/server/0008-Gale-semantic-version.patch +++ b/patches/server/0008-Gale-semantic-version.patch @@ -29,7 +29,7 @@ index 2868dab7b100d9c325b0e5056f86660d631dec4b..2acad4c3fd58178b0f8b22bdb04eeeeb } diff --git a/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java b/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java new file mode 100644 -index 0000000000000000000000000000000000000000..d313213da0498d9229a3ac859513ed985fbfe381 +index 0000000000000000000000000000000000000000..da57462950965fe3bcb7f08e2ba9f15e4508876a --- /dev/null +++ b/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java @@ -0,0 +1,37 @@ @@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..d313213da0498d9229a3ac859513ed98 + * The patch version is incremented for small changes that do not affect the goal of any feature, + * such as bug fixes, performance improvements or changes in wording. + */ -+ public static final @NotNull String version = "0.6.9"; ++ public static final @NotNull String version = "0.6.10"; + + /** + * The "major.minor" portion of the {@link #version}. diff --git a/patches/server/0009-Gale-configuration.patch b/patches/server/0009-Gale-configuration.patch index 2e60a82..2eb0512 100644 --- a/patches/server/0009-Gale-configuration.patch +++ b/patches/server/0009-Gale-configuration.patch @@ -160,7 +160,7 @@ index a0aa1f1a7adf986d500a2135aa42e138aa3c4f08..6d19b985222d78750828fd2719c1fbf7 } } diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java -index e471960e0443392f6f54732b052a4debf2a8fd97..c56b9264d83ae98a4cc0945ea1bd919e9a5de57a 100644 +index 2d3068b7748032342edd81e6ea4a7c08988fb28d..c36c58e330c139d1b28e5ff2a23deaca0008ce89 100644 --- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java +++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java @@ -135,7 +135,7 @@ public class PaperConfigurations extends Configurations. diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -index 21f77ea9d8a68eef569f1df6eba0495e5740acdd..7a7d10a9c1764ae618112a453a5191124b1e6e8d 100644 +index 8cd33a3cbce5195923317f05bf1d73809300cd52..3810cae80cb2dcb721ed25d566b1fe3fb87db4c2 100644 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -@@ -89,7 +89,10 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -90,7 +90,10 @@ public class GlobalConfiguration extends ConfigurationPart { public Timings timings; public class Timings extends ConfigurationPart.Post { @@ -46,7 +46,7 @@ index 21f77ea9d8a68eef569f1df6eba0495e5740acdd..7a7d10a9c1764ae618112a453a519112 public boolean verbose = true; public String url = "https://timin.gs/"; // Gale - use timin.gs by default public boolean serverNamePrivacy = false; -@@ -103,6 +106,13 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -104,6 +107,13 @@ public class GlobalConfiguration extends ConfigurationPart { @Override public void postProcess() { diff --git a/patches/server/0018-Remove-vanilla-profiler.patch b/patches/server/0018-Remove-vanilla-profiler.patch index a70f337..c146d23 100644 --- a/patches/server/0018-Remove-vanilla-profiler.patch +++ b/patches/server/0018-Remove-vanilla-profiler.patch @@ -1094,7 +1094,7 @@ index e8485fb900b25e911a858678a833852731cb2ace..6a3b3370eb0c2670c13e3133ac86a9b1 } } else { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index e11d7283662834047b2ff81a2fd25a4263792deb..056d7f857cbda68792ee27b35f14fc6872fd90e1 100644 +index 78c98f38bc263664ea4cd344670243a7d372885c..e832b6ce0e253a5696b50ee5956ef69762560261 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -405,7 +405,6 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -1607,7 +1607,7 @@ index 8f97c9df726ac20cfce7bdddd5dd4f8c5aa76c35..8f2c0dcb0ca69ea1b09bb055c6a94949 } diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index f95aa6362605c10145a212ed4b7df42ad443f4cf..baf53980acfe52ec23b7f2f2183c2287c7b15d74 100644 +index d37848e2b361f5c3a893036c8710a3b41622d7f2..0097cc2d0856d782764d3a128f14440aed805bdb 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -129,7 +129,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @@ -1635,7 +1635,7 @@ index f95aa6362605c10145a212ed4b7df42ad443f4cf..baf53980acfe52ec23b7f2f2183c2287 this.levelData = worlddatamutable; this.dimensionTypeRegistration = holder; this.dimensionTypeId = (ResourceKey) holder.unwrapKey().orElseThrow(() -> { -@@ -863,9 +861,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -947,9 +945,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { } protected void tickBlockEntities() { @@ -1645,7 +1645,7 @@ index f95aa6362605c10145a212ed4b7df42ad443f4cf..baf53980acfe52ec23b7f2f2183c2287 timings.tileEntityPending.startTiming(); // Spigot this.tickingBlockEntities = true; if (!this.pendingBlockEntityTickers.isEmpty()) { -@@ -910,7 +905,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -994,7 +989,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { timings.tileEntityTick.stopTiming(); // Spigot this.tickingBlockEntities = false; co.aikar.timings.TimingHistory.tileEntityTicks += this.blockEntityTickers.size(); // Paper @@ -1653,7 +1653,7 @@ index f95aa6362605c10145a212ed4b7df42ad443f4cf..baf53980acfe52ec23b7f2f2183c2287 spigotConfig.currentPrimedTnt = 0; // Spigot } -@@ -1103,7 +1097,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1187,7 +1181,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @Override public List getEntities(@Nullable Entity except, AABB box, Predicate predicate) { @@ -1661,7 +1661,7 @@ index f95aa6362605c10145a212ed4b7df42ad443f4cf..baf53980acfe52ec23b7f2f2183c2287 List list = Lists.newArrayList(); ((ServerLevel)this).getEntityLookup().getEntities(except, box, list, predicate); // Paper - optimise this call return list; -@@ -1122,7 +1115,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1206,7 +1199,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { } public void getEntities(EntityTypeTest filter, AABB box, Predicate predicate, List result, int limit) { @@ -1669,7 +1669,7 @@ index f95aa6362605c10145a212ed4b7df42ad443f4cf..baf53980acfe52ec23b7f2f2183c2287 // Paper start - optimise this call //TODO use limit if (filter instanceof net.minecraft.world.entity.EntityType entityTypeTest) { -@@ -1379,11 +1371,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1463,11 +1455,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable { } public ProfilerFiller getProfiler() { diff --git a/patches/server/0022-Simpler-ShapelessRecipe-comparison-for-vanilla.patch b/patches/server/0021-Simpler-ShapelessRecipe-comparison-for-vanilla.patch similarity index 100% rename from patches/server/0022-Simpler-ShapelessRecipe-comparison-for-vanilla.patch rename to patches/server/0021-Simpler-ShapelessRecipe-comparison-for-vanilla.patch diff --git a/patches/server/0021-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0021-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch deleted file mode 100644 index a750fb7..0000000 --- a/patches/server/0021-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch +++ /dev/null @@ -1,171 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Martijn Muijsers -Date: Wed, 23 Nov 2022 16:15:43 +0100 -Subject: [PATCH] Strip raytracing for EntityLiving#hasLineOfSight - -License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) -Gale - https://galemc.org - -This patch is based on the following patch: -"Strip raytracing for EntityLiving#hasLineOfSight" -By: Paul Sauve -As part of: Airplane (https://github.com/TECHNOVE/Airplane) -Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) - -* Airplane description * - -The IBlockAccess#rayTrace method is very wasteful in both allocations, -and in logic. While EntityLiving#hasLineOfSight provides static -parameters for collisions with blocks and fluids, the method still does -a lot of dynamic checks for both of these, which result in extra work. -As well, since the fluid collision option is set to NONE, the entire -fluid collision system is completely unneeded, yet used anyways. - -* Airplane copyright * - -Airplane -Copyright (C) 2020 Technove LLC - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . - -diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 056d7f857cbda68792ee27b35f14fc6872fd90e1..e1f8f3480bfda2bc3c042d0b57cbb051ad3d95bc 100644 ---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java -+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3633,7 +3633,7 @@ public abstract class LivingEntity extends Entity implements Attackable { - Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ()); - - // Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists -- return vec3d1.distanceToSqr(vec3d) > 128D * 128D ? false : this.level().clip(new ClipContext(vec3d, vec3d1, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this)).getType() == HitResult.Type.MISS; -+ return vec3d1.distanceToSqr(vec3d) > 128D * 128D ? false : this.level().rayTraceDirect(vec3d, vec3d1, net.minecraft.world.phys.shapes.CollisionContext.of(this)) == net.minecraft.world.phys.BlockHitResult.Type.MISS; // Paper - use distanceToSqr // Gale - Airplane - strip raytracing for EntityLiving#hasLineOfSight - } - } - -diff --git a/src/main/java/net/minecraft/world/level/BlockGetter.java b/src/main/java/net/minecraft/world/level/BlockGetter.java -index 0e8746759752b692668886370181aa5db1fd0bb0..e5e50817c83b6a7d3daf90960ed402180998ca49 100644 ---- a/src/main/java/net/minecraft/world/level/BlockGetter.java -+++ b/src/main/java/net/minecraft/world/level/BlockGetter.java -@@ -68,6 +68,16 @@ public interface BlockGetter extends LevelHeightAccessor { - }); - } - -+ // Gale start - Airplane - strip raytracing for EntityLiving#hasLineOfSight - broken down variant of below rayTraceBlock, used by World#rayTraceDirect -+ default net.minecraft.world.phys.BlockHitResult.Type rayTraceBlockDirect(Vec3 vec3d, Vec3 vec3d1, BlockPos blockposition, BlockState iblockdata, net.minecraft.world.phys.shapes.CollisionContext voxelshapecoll) { -+ if (iblockdata.isAir()) return null; // Tuinity - optimise air cases -+ VoxelShape voxelshape = ClipContext.Block.COLLIDER.get(iblockdata, this, blockposition, voxelshapecoll); -+ net.minecraft.world.phys.BlockHitResult movingobjectpositionblock = this.clipWithInteractionOverride(vec3d, vec3d1, blockposition, voxelshape, iblockdata); -+ -+ return movingobjectpositionblock == null ? null : movingobjectpositionblock.getType(); -+ } -+ // Gale end - Airplane - strip raytracing for EntityLiving#hasLineOfSight - broken down variant of below rayTraceBlock, used by World#rayTraceDirect -+ - // CraftBukkit start - moved block handling into separate method for use by Block#rayTrace - default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition) { - // Paper start - Prevent raytrace from loading chunks -diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index baf53980acfe52ec23b7f2f2183c2287c7b15d74..96921ace1ecc5472794df9bf4fa5fd73e9779f5c 100644 ---- a/src/main/java/net/minecraft/world/level/Level.java -+++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -409,6 +409,91 @@ public abstract class Level implements LevelAccessor, AutoCloseable { - return null; - } - -+ // Gale start - Airplane - strip raytracing for EntityLiving#hasLineOfSight - broken down method of raytracing for EntityLiving#hasLineOfSight, replaces IBlockAccess#rayTrace(RayTrace) -+ public net.minecraft.world.phys.BlockHitResult.Type rayTraceDirect(net.minecraft.world.phys.Vec3 vec3d, net.minecraft.world.phys.Vec3 vec3d1, net.minecraft.world.phys.shapes.CollisionContext voxelshapecoll) { -+ // most of this code comes from IBlockAccess#a(RayTrace, BiFunction, Function), but removes the needless functions -+ if (vec3d.equals(vec3d1)) { -+ return net.minecraft.world.phys.BlockHitResult.Type.MISS; -+ } -+ -+ double endX = Mth.lerp(-1.0E-7D, vec3d1.x, vec3d.x); -+ double endY = Mth.lerp(-1.0E-7D, vec3d1.y, vec3d.y); -+ double endZ = Mth.lerp(-1.0E-7D, vec3d1.z, vec3d.z); -+ -+ double startX = Mth.lerp(-1.0E-7D, vec3d.x, vec3d1.x); -+ double startY = Mth.lerp(-1.0E-7D, vec3d.y, vec3d1.y); -+ double startZ = Mth.lerp(-1.0E-7D, vec3d.z, vec3d1.z); -+ -+ int currentX = Mth.floor(startX); -+ int currentY = Mth.floor(startY); -+ int currentZ = Mth.floor(startZ); -+ -+ BlockPos.MutableBlockPos currentBlock = new BlockPos.MutableBlockPos(currentX, currentY, currentZ); -+ -+ LevelChunk chunk = this.getChunkIfLoaded(currentBlock); -+ if (chunk == null) { -+ return net.minecraft.world.phys.BlockHitResult.Type.MISS; -+ } -+ -+ net.minecraft.world.phys.BlockHitResult.Type initialCheck = this.rayTraceBlockDirect(vec3d, vec3d1, currentBlock, chunk.getBlockState(currentBlock), voxelshapecoll); -+ -+ if (initialCheck != null) { -+ return initialCheck; -+ } -+ -+ double diffX = endX - startX; -+ double diffY = endY - startY; -+ double diffZ = endZ - startZ; -+ -+ int xDirection = Mth.sign(diffX); -+ int yDirection = Mth.sign(diffY); -+ int zDirection = Mth.sign(diffZ); -+ -+ double normalizedX = xDirection == 0 ? Double.MAX_VALUE : (double) xDirection / diffX; -+ double normalizedY = yDirection == 0 ? Double.MAX_VALUE : (double) yDirection / diffY; -+ double normalizedZ = zDirection == 0 ? Double.MAX_VALUE : (double) zDirection / diffZ; -+ -+ double normalizedXDirection = normalizedX * (xDirection > 0 ? 1.0D - Mth.frac(startX) : Mth.frac(startX)); -+ double normalizedYDirection = normalizedY * (yDirection > 0 ? 1.0D - Mth.frac(startY) : Mth.frac(startY)); -+ double normalizedZDirection = normalizedZ * (zDirection > 0 ? 1.0D - Mth.frac(startZ) : Mth.frac(startZ)); -+ -+ net.minecraft.world.phys.BlockHitResult.Type result; -+ -+ do { -+ if (normalizedXDirection > 1.0D && normalizedYDirection > 1.0D && normalizedZDirection > 1.0D) { -+ return net.minecraft.world.phys.BlockHitResult.Type.MISS; -+ } -+ -+ if (normalizedXDirection < normalizedYDirection) { -+ if (normalizedXDirection < normalizedZDirection) { -+ currentX += xDirection; -+ normalizedXDirection += normalizedX; -+ } else { -+ currentZ += zDirection; -+ normalizedZDirection += normalizedZ; -+ } -+ } else if (normalizedYDirection < normalizedZDirection) { -+ currentY += yDirection; -+ normalizedYDirection += normalizedY; -+ } else { -+ currentZ += zDirection; -+ normalizedZDirection += normalizedZ; -+ } -+ -+ currentBlock.set(currentX, currentY, currentZ); -+ if (chunk.getPos().x != currentBlock.getX() >> 4 || chunk.getPos().z != currentBlock.getZ() >> 4) { -+ chunk = this.getChunkIfLoaded(currentBlock); -+ if (chunk == null) { -+ return net.minecraft.world.phys.BlockHitResult.Type.MISS; -+ } -+ } -+ result = this.rayTraceBlockDirect(vec3d, vec3d1, currentBlock, chunk.getBlockState(currentBlock), voxelshapecoll); -+ } while (result == null); -+ -+ return result; -+ } -+ // Gale end - Airplane - strip raytracing for EntityLiving#hasLineOfSight - broken down method of raytracing for EntityLiving#hasLineOfSight, replaces IBlockAccess#rayTrace(RayTrace) -+ - public boolean isInWorldBounds(BlockPos pos) { - return pos.isInsideBuildHeightAndWorldBoundsHorizontal(this); // Paper - use better/optimized check - } diff --git a/patches/server/0023-Reduce-projectile-chunk-loading.patch b/patches/server/0022-Reduce-projectile-chunk-loading.patch similarity index 100% rename from patches/server/0023-Reduce-projectile-chunk-loading.patch rename to patches/server/0022-Reduce-projectile-chunk-loading.patch diff --git a/patches/server/0024-Predict-Halloween.patch b/patches/server/0023-Predict-Halloween.patch similarity index 100% rename from patches/server/0024-Predict-Halloween.patch rename to patches/server/0023-Predict-Halloween.patch diff --git a/patches/server/0025-Move-random-tick-random.patch b/patches/server/0024-Move-random-tick-random.patch similarity index 96% rename from patches/server/0025-Move-random-tick-random.patch rename to patches/server/0024-Move-random-tick-random.patch index 2724ab1..26e6c70 100644 --- a/patches/server/0025-Move-random-tick-random.patch +++ b/patches/server/0024-Move-random-tick-random.patch @@ -31,7 +31,7 @@ index 287f6a38a6f042983c5e652ff9800fb215a91221..47acb63bfca2f722a595cf6614c28e75 public void tickChunk(LevelChunk chunk, int randomTickSpeed) { diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 96921ace1ecc5472794df9bf4fa5fd73e9779f5c..cb32c25a95fb16f02d84371d4bd0e4bc2755cb79 100644 +index 0097cc2d0856d782764d3a128f14440aed805bdb..013b445da073ba0e97eb5f80879f122286e1d2c5 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -181,6 +181,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0026-Optimize-random-calls-in-chunk-ticking.patch b/patches/server/0025-Optimize-random-calls-in-chunk-ticking.patch similarity index 100% rename from patches/server/0026-Optimize-random-calls-in-chunk-ticking.patch rename to patches/server/0025-Optimize-random-calls-in-chunk-ticking.patch diff --git a/patches/server/0027-Reduce-enderman-teleport-chunk-lookups.patch b/patches/server/0026-Reduce-enderman-teleport-chunk-lookups.patch similarity index 100% rename from patches/server/0027-Reduce-enderman-teleport-chunk-lookups.patch rename to patches/server/0026-Reduce-enderman-teleport-chunk-lookups.patch diff --git a/patches/server/0028-Reduce-acquire-POI-for-stuck-entities.patch b/patches/server/0027-Reduce-acquire-POI-for-stuck-entities.patch similarity index 94% rename from patches/server/0028-Reduce-acquire-POI-for-stuck-entities.patch rename to patches/server/0027-Reduce-acquire-POI-for-stuck-entities.patch index 10afefb..e20dea2 100644 --- a/patches/server/0028-Reduce-acquire-POI-for-stuck-entities.patch +++ b/patches/server/0027-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/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java -index d4c91e0a0c64fcb7f1145de3f30134cb1f1f8ee6..aed7e9affaae1e0d1e3324a41e5818435f76fd0f 100644 +index 8f8b29f80d1573981ccffd207dd6e0941e71a352..aed7e9affaae1e0d1e3324a41e5818435f76fd0f 100644 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java @@ -13,6 +13,7 @@ import net.minecraft.core.BlockPos; @@ -56,7 +56,7 @@ index d4c91e0a0c64fcb7f1145de3f30134cb1f1f8ee6..aed7e9affaae1e0d1e3324a41e581843 public static BehaviorControl create(Predicate> poiPredicate, MemoryModuleType poiPosModule, boolean onlyRunIfChild, Optional entityStatus) { return create(poiPredicate, poiPosModule, poiPosModule, onlyRunIfChild, entityStatus); } -@@ -42,11 +50,13 @@ public class AcquirePoi { +@@ -42,12 +50,13 @@ public class AcquirePoi { return false; } else if (mutableLong.getValue() == 0L) { mutableLong.setValue(world.getGameTime() + (long)world.random.nextInt(20)); @@ -66,6 +66,7 @@ index d4c91e0a0c64fcb7f1145de3f30134cb1f1f8ee6..aed7e9affaae1e0d1e3324a41e581843 return false; } else { mutableLong.setValue(time + 20L + (long)world.getRandom().nextInt(20)); +- if (entity.getNavigation().isStuck()) mutableLong.add(200); // Paper - Wait an additional 10s to check again if they're stuck + addAdditionalTimeToMutableLongIfEntityIsStuck(mutableLong, world, entity); // Gale - Airplane - reduce acquire POI for stuck entities PoiManager poiManager = world.getPoiManager(); long2ObjectMap.long2ObjectEntrySet().removeIf((entry) -> { diff --git a/patches/server/0029-Remove-iterators-from-Inventory-contains.patch b/patches/server/0028-Remove-iterators-from-Inventory-contains.patch similarity index 100% rename from patches/server/0029-Remove-iterators-from-Inventory-contains.patch rename to patches/server/0028-Remove-iterators-from-Inventory-contains.patch diff --git a/patches/server/0030-Check-targeting-range-before-getting-visibility.patch b/patches/server/0029-Check-targeting-range-before-getting-visibility.patch similarity index 100% rename from patches/server/0030-Check-targeting-range-before-getting-visibility.patch rename to patches/server/0029-Check-targeting-range-before-getting-visibility.patch diff --git a/patches/server/0031-Print-stack-trace-for-plugins-not-shutting-down-task.patch b/patches/server/0030-Print-stack-trace-for-plugins-not-shutting-down-task.patch similarity index 100% rename from patches/server/0031-Print-stack-trace-for-plugins-not-shutting-down-task.patch rename to patches/server/0030-Print-stack-trace-for-plugins-not-shutting-down-task.patch diff --git a/patches/server/0032-Improve-fluid-direction-caching.patch b/patches/server/0031-Improve-fluid-direction-caching.patch similarity index 100% rename from patches/server/0032-Improve-fluid-direction-caching.patch rename to patches/server/0031-Improve-fluid-direction-caching.patch diff --git a/patches/server/0033-Cache-on-climbable-check.patch b/patches/server/0032-Cache-on-climbable-check.patch similarity index 97% rename from patches/server/0033-Cache-on-climbable-check.patch rename to patches/server/0032-Cache-on-climbable-check.patch index e2f4387..5f73011 100644 --- a/patches/server/0033-Cache-on-climbable-check.patch +++ b/patches/server/0032-Cache-on-climbable-check.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/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index e1f8f3480bfda2bc3c042d0b57cbb051ad3d95bc..6ad84442f7722f709c7430a1b22a59957852c28b 100644 +index e832b6ce0e253a5696b50ee5956ef69762560261..607a5ad9164085842cd802fcf9f15357d9d8ef29 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -142,7 +142,6 @@ import org.bukkit.event.entity.EntityTeleportEvent; diff --git a/patches/server/0034-Make-EntityCollisionContext-a-live-representation.patch b/patches/server/0033-Make-EntityCollisionContext-a-live-representation.patch similarity index 100% rename from patches/server/0034-Make-EntityCollisionContext-a-live-representation.patch rename to patches/server/0033-Make-EntityCollisionContext-a-live-representation.patch diff --git a/patches/server/0035-Improve-container-checking-with-a-bitset.patch b/patches/server/0034-Improve-container-checking-with-a-bitset.patch similarity index 100% rename from patches/server/0035-Improve-container-checking-with-a-bitset.patch rename to patches/server/0034-Improve-container-checking-with-a-bitset.patch diff --git a/patches/server/0036-Better-checking-for-useless-move-packets.patch b/patches/server/0035-Better-checking-for-useless-move-packets.patch similarity index 100% rename from patches/server/0036-Better-checking-for-useless-move-packets.patch rename to patches/server/0035-Better-checking-for-useless-move-packets.patch diff --git a/patches/server/0038-Use-aging-cache-for-biome-temperatures.patch b/patches/server/0036-Use-aging-cache-for-biome-temperatures.patch similarity index 100% rename from patches/server/0038-Use-aging-cache-for-biome-temperatures.patch rename to patches/server/0036-Use-aging-cache-for-biome-temperatures.patch diff --git a/patches/server/0039-Inline-level-height.patch b/patches/server/0037-Inline-level-height.patch similarity index 97% rename from patches/server/0039-Inline-level-height.patch rename to patches/server/0037-Inline-level-height.patch index 1af9ce4..33264ff 100644 --- a/patches/server/0039-Inline-level-height.patch +++ b/patches/server/0037-Inline-level-height.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/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index cb32c25a95fb16f02d84371d4bd0e4bc2755cb79..7ef39a42040d84264a059e32b1d853083ece7b32 100644 +index 013b445da073ba0e97eb5f80879f122286e1d2c5..708a188e22e8936a6d53ed77f8a2e07525b61e6a 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -272,6 +272,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0037-Use-fast-item-merge-raytracing.patch b/patches/server/0037-Use-fast-item-merge-raytracing.patch deleted file mode 100644 index 9465d6c..0000000 --- a/patches/server/0037-Use-fast-item-merge-raytracing.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Martijn Muijsers -Date: Wed, 23 Nov 2022 22:29:05 +0100 -Subject: [PATCH] Use fast item merge raytracing - -License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) -Gale - https://galemc.org - -This patch is based on the following patch: -"Patch Paper to use fast item merge raytracing" -By: Paul Sauve -As part of: Airplane (https://github.com/TECHNOVE/Airplane) -Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) - -* Airplane copyright * - -Airplane -Copyright (C) 2020 Technove LLC - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . - -diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java -index 52196431a6538872755344859a0454a0e50c3b6e..a85f3a9b52748b32eece5364c59d0aa282f91a22 100644 ---- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java -+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java -@@ -270,10 +270,16 @@ public class ItemEntity extends Entity implements TraceableEntity { - if (entityitem.isMergable()) { - // Paper Start - Fix items merging through walls - if (this.level().paperConfig().fixes.fixItemsMergingThroughWalls) { -+ // Gale start - Airplane - use fast item merge raytracing - skip the allocations -+ /* - net.minecraft.world.level.ClipContext rayTrace = new net.minecraft.world.level.ClipContext(this.position(), entityitem.position(), - net.minecraft.world.level.ClipContext.Block.COLLIDER, net.minecraft.world.level.ClipContext.Fluid.NONE, this); - net.minecraft.world.phys.BlockHitResult rayTraceResult = this.level().clip(rayTrace); - if (rayTraceResult.getType() == net.minecraft.world.phys.HitResult.Type.BLOCK) continue; -+ */ -+ if (level().rayTraceDirect(this.position(), entityitem.position(), net.minecraft.world.phys.shapes.CollisionContext.of(this)) == -+ net.minecraft.world.phys.HitResult.Type.BLOCK) continue; -+ // Gale end - Airplane - use fast item merge raytracing - skip the allocations - } - // Paper End - this.tryToMerge(entityitem); diff --git a/patches/server/0040-Use-ThreadUnsafeRandom-for-mob-spawning.patch b/patches/server/0038-Use-ThreadUnsafeRandom-for-mob-spawning.patch similarity index 100% rename from patches/server/0040-Use-ThreadUnsafeRandom-for-mob-spawning.patch rename to patches/server/0038-Use-ThreadUnsafeRandom-for-mob-spawning.patch diff --git a/patches/server/0041-Remove-streams-and-iterators-from-range-check.patch b/patches/server/0039-Remove-streams-and-iterators-from-range-check.patch similarity index 100% rename from patches/server/0041-Remove-streams-and-iterators-from-range-check.patch rename to patches/server/0039-Remove-streams-and-iterators-from-range-check.patch diff --git a/patches/server/0042-Remove-streams-from-getting-nearby-players.patch b/patches/server/0040-Remove-streams-from-getting-nearby-players.patch similarity index 100% rename from patches/server/0042-Remove-streams-from-getting-nearby-players.patch rename to patches/server/0040-Remove-streams-from-getting-nearby-players.patch diff --git a/patches/server/0043-Block-goal-does-not-load-chunks.patch b/patches/server/0041-Block-goal-does-not-load-chunks.patch similarity index 100% rename from patches/server/0043-Block-goal-does-not-load-chunks.patch rename to patches/server/0041-Block-goal-does-not-load-chunks.patch diff --git a/patches/server/0044-Reduce-entity-allocations.patch b/patches/server/0042-Reduce-entity-allocations.patch similarity index 100% rename from patches/server/0044-Reduce-entity-allocations.patch rename to patches/server/0042-Reduce-entity-allocations.patch diff --git a/patches/server/0045-Remove-lambda-from-ticking-guard.patch b/patches/server/0043-Remove-lambda-from-ticking-guard.patch similarity index 96% rename from patches/server/0045-Remove-lambda-from-ticking-guard.patch rename to patches/server/0043-Remove-lambda-from-ticking-guard.patch index 78aacfa..d3fa4ec 100644 --- a/patches/server/0045-Remove-lambda-from-ticking-guard.patch +++ b/patches/server/0043-Remove-lambda-from-ticking-guard.patch @@ -57,10 +57,10 @@ index b7318670e039e05a058e437e025519d40557bb88..efbc8483a51c5272ca81747c82dc65e7 } } diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 7ef39a42040d84264a059e32b1d853083ece7b32..db481e39fca1d6fd6dcd0c076f413b0f191fb0b3 100644 +index 708a188e22e8936a6d53ed77f8a2e07525b61e6a..761e3c07726bdead7acf9769b9a973750b7d0335 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -1015,13 +1015,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1014,13 +1014,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { try { tickConsumer.accept(entity); MinecraftServer.getServer().executeMidTickTasks(); // Paper - execute chunk tasks mid tick diff --git a/patches/server/0046-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0044-Reduce-entity-fluid-lookups-if-no-fluids.patch similarity index 100% rename from patches/server/0046-Reduce-entity-fluid-lookups-if-no-fluids.patch rename to patches/server/0044-Reduce-entity-fluid-lookups-if-no-fluids.patch diff --git a/patches/server/0047-SIMD-support.patch b/patches/server/0045-SIMD-support.patch similarity index 98% rename from patches/server/0047-SIMD-support.patch rename to patches/server/0045-SIMD-support.patch index 11e6c52..420a88e 100644 --- a/patches/server/0047-SIMD-support.patch +++ b/patches/server/0045-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/build.gradle.kts b/build.gradle.kts -index 9606c6954f2c53dbbda7e7235cf37308822fea02..4466f21a83cb9ddca7309a194afcb8eded92de81 100644 +index b36949c1b5bd2c5af1ee7496c8b8372fe263ad79..09049dea171e627174f986737eec68667650ef26 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -73,6 +73,7 @@ tasks.withType { diff --git a/patches/server/0048-Make-book-writing-configurable.patch b/patches/server/0046-Make-book-writing-configurable.patch similarity index 100% rename from patches/server/0048-Make-book-writing-configurable.patch rename to patches/server/0046-Make-book-writing-configurable.patch diff --git a/patches/server/0049-Optimize-entity-coordinate-key.patch b/patches/server/0047-Optimize-entity-coordinate-key.patch similarity index 100% rename from patches/server/0049-Optimize-entity-coordinate-key.patch rename to patches/server/0047-Optimize-entity-coordinate-key.patch diff --git a/patches/server/0050-Reduce-in-wall-checks.patch b/patches/server/0048-Reduce-in-wall-checks.patch similarity index 97% rename from patches/server/0050-Reduce-in-wall-checks.patch rename to patches/server/0048-Reduce-in-wall-checks.patch index f7621ea..5a858ca 100644 --- a/patches/server/0050-Reduce-in-wall-checks.patch +++ b/patches/server/0048-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/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 6ad84442f7722f709c7430a1b22a59957852c28b..559e85f266614f08e5b383e41f9898b2cca28513 100644 +index 607a5ad9164085842cd802fcf9f15357d9d8ef29..597866e969e0f5deddaaaedd9b1618edd507bae9 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -412,7 +412,10 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0051-Make-chat-order-verification-configurable.patch b/patches/server/0049-Make-chat-order-verification-configurable.patch similarity index 100% rename from patches/server/0051-Make-chat-order-verification-configurable.patch rename to patches/server/0049-Make-chat-order-verification-configurable.patch diff --git a/patches/server/0052-Make-ender-dragon-respawn-attempt-after-placing-end-.patch b/patches/server/0050-Make-ender-dragon-respawn-attempt-after-placing-end-.patch similarity index 100% rename from patches/server/0052-Make-ender-dragon-respawn-attempt-after-placing-end-.patch rename to patches/server/0050-Make-ender-dragon-respawn-attempt-after-placing-end-.patch diff --git a/patches/server/0053-Make-saving-fireworks-configurable.patch b/patches/server/0051-Make-saving-fireworks-configurable.patch similarity index 100% rename from patches/server/0053-Make-saving-fireworks-configurable.patch rename to patches/server/0051-Make-saving-fireworks-configurable.patch diff --git a/patches/server/0054-Don-t-trigger-lootable-refresh-for-non-player-intera.patch b/patches/server/0052-Don-t-trigger-lootable-refresh-for-non-player-intera.patch similarity index 100% rename from patches/server/0054-Don-t-trigger-lootable-refresh-for-non-player-intera.patch rename to patches/server/0052-Don-t-trigger-lootable-refresh-for-non-player-intera.patch diff --git a/patches/server/0055-Reduce-hopper-item-checks.patch b/patches/server/0053-Reduce-hopper-item-checks.patch similarity index 99% rename from patches/server/0055-Reduce-hopper-item-checks.patch rename to patches/server/0053-Reduce-hopper-item-checks.patch index 7c08e6d..edea45d 100644 --- a/patches/server/0055-Reduce-hopper-item-checks.patch +++ b/patches/server/0053-Reduce-hopper-item-checks.patch @@ -17,7 +17,7 @@ Licensed under: MIT (https://opensource.org/licenses/MIT) Only do an item "suck in" action once per second diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java -index a85f3a9b52748b32eece5364c59d0aa282f91a22..a54e0c2759a3987dc74dfdd8e61962841122a5f6 100644 +index d39f31e7cf315c7cdc1daab28164380e44dd8341..2639acd2c16c178ac134dd04e0cdc83dad1aa1d6 100644 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java @@ -14,11 +14,13 @@ import net.minecraft.world.entity.Entity; diff --git a/patches/server/0056-Reduce-villager-item-re-pickup.patch b/patches/server/0054-Reduce-villager-item-re-pickup.patch similarity index 100% rename from patches/server/0056-Reduce-villager-item-re-pickup.patch rename to patches/server/0054-Reduce-villager-item-re-pickup.patch diff --git a/patches/server/0057-Variable-entity-wake-up-duration.patch b/patches/server/0055-Variable-entity-wake-up-duration.patch similarity index 100% rename from patches/server/0057-Variable-entity-wake-up-duration.patch rename to patches/server/0055-Variable-entity-wake-up-duration.patch diff --git a/patches/server/0058-Do-not-process-chat-commands-before-player-has-joine.patch b/patches/server/0056-Do-not-process-chat-commands-before-player-has-joine.patch similarity index 100% rename from patches/server/0058-Do-not-process-chat-commands-before-player-has-joine.patch rename to patches/server/0056-Do-not-process-chat-commands-before-player-has-joine.patch diff --git a/patches/server/0059-Do-not-log-invalid-statistics.patch b/patches/server/0057-Do-not-log-invalid-statistics.patch similarity index 100% rename from patches/server/0059-Do-not-log-invalid-statistics.patch rename to patches/server/0057-Do-not-log-invalid-statistics.patch diff --git a/patches/server/0060-Do-not-log-empty-message-warnings.patch b/patches/server/0058-Do-not-log-empty-message-warnings.patch similarity index 100% rename from patches/server/0060-Do-not-log-empty-message-warnings.patch rename to patches/server/0058-Do-not-log-empty-message-warnings.patch diff --git a/patches/server/0061-Do-not-log-ignored-advancements.patch b/patches/server/0059-Do-not-log-ignored-advancements.patch similarity index 100% rename from patches/server/0061-Do-not-log-ignored-advancements.patch rename to patches/server/0059-Do-not-log-ignored-advancements.patch diff --git a/patches/server/0062-Do-not-log-setBlock-in-far-chunks.patch b/patches/server/0060-Do-not-log-setBlock-in-far-chunks.patch similarity index 100% rename from patches/server/0062-Do-not-log-setBlock-in-far-chunks.patch rename to patches/server/0060-Do-not-log-setBlock-in-far-chunks.patch diff --git a/patches/server/0063-Do-not-log-unrecognized-recipes.patch b/patches/server/0061-Do-not-log-unrecognized-recipes.patch similarity index 100% rename from patches/server/0063-Do-not-log-unrecognized-recipes.patch rename to patches/server/0061-Do-not-log-unrecognized-recipes.patch diff --git a/patches/server/0064-Do-not-log-legacy-Material-initialization.patch b/patches/server/0062-Do-not-log-legacy-Material-initialization.patch similarity index 100% rename from patches/server/0064-Do-not-log-legacy-Material-initialization.patch rename to patches/server/0062-Do-not-log-legacy-Material-initialization.patch diff --git a/patches/server/0065-Do-not-log-plugin-library-loads.patch b/patches/server/0063-Do-not-log-plugin-library-loads.patch similarity index 100% rename from patches/server/0065-Do-not-log-plugin-library-loads.patch rename to patches/server/0063-Do-not-log-plugin-library-loads.patch diff --git a/patches/server/0066-Do-not-log-expired-message-warnings.patch b/patches/server/0064-Do-not-log-expired-message-warnings.patch similarity index 100% rename from patches/server/0066-Do-not-log-expired-message-warnings.patch rename to patches/server/0064-Do-not-log-expired-message-warnings.patch diff --git a/patches/server/0067-Do-not-log-out-of-order-message-warnings.patch b/patches/server/0065-Do-not-log-out-of-order-message-warnings.patch similarity index 100% rename from patches/server/0067-Do-not-log-out-of-order-message-warnings.patch rename to patches/server/0065-Do-not-log-out-of-order-message-warnings.patch diff --git a/patches/server/0068-Do-not-log-Not-Secure-marker.patch b/patches/server/0066-Do-not-log-Not-Secure-marker.patch similarity index 100% rename from patches/server/0068-Do-not-log-Not-Secure-marker.patch rename to patches/server/0066-Do-not-log-Not-Secure-marker.patch diff --git a/patches/server/0069-Do-not-log-disconnections-with-null-id.patch b/patches/server/0067-Do-not-log-disconnections-with-null-id.patch similarity index 100% rename from patches/server/0069-Do-not-log-disconnections-with-null-id.patch rename to patches/server/0067-Do-not-log-disconnections-with-null-id.patch diff --git a/patches/server/0070-Do-not-log-run-as-root-warning.patch b/patches/server/0068-Do-not-log-run-as-root-warning.patch similarity index 100% rename from patches/server/0070-Do-not-log-run-as-root-warning.patch rename to patches/server/0068-Do-not-log-run-as-root-warning.patch diff --git a/patches/server/0071-Do-not-log-offline-mode-warning.patch b/patches/server/0069-Do-not-log-offline-mode-warning.patch similarity index 100% rename from patches/server/0071-Do-not-log-offline-mode-warning.patch rename to patches/server/0069-Do-not-log-offline-mode-warning.patch diff --git a/patches/server/0072-Softly-log-invalid-pool-element-errors.patch b/patches/server/0070-Softly-log-invalid-pool-element-errors.patch similarity index 100% rename from patches/server/0072-Softly-log-invalid-pool-element-errors.patch rename to patches/server/0070-Softly-log-invalid-pool-element-errors.patch diff --git a/patches/server/0073-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0071-Fix-outdated-server-showing-in-ping-before-server-fu.patch similarity index 100% rename from patches/server/0073-Fix-outdated-server-showing-in-ping-before-server-fu.patch rename to patches/server/0071-Fix-outdated-server-showing-in-ping-before-server-fu.patch diff --git a/patches/server/0074-Make-sand-duping-fix-configurable.patch b/patches/server/0072-Make-sand-duping-fix-configurable.patch similarity index 100% rename from patches/server/0074-Make-sand-duping-fix-configurable.patch rename to patches/server/0072-Make-sand-duping-fix-configurable.patch diff --git a/patches/server/0075-Make-tripwire-duping-fix-configurable.patch b/patches/server/0073-Make-tripwire-duping-fix-configurable.patch similarity index 100% rename from patches/server/0075-Make-tripwire-duping-fix-configurable.patch rename to patches/server/0073-Make-tripwire-duping-fix-configurable.patch diff --git a/patches/server/0076-Fix-MC-238526.patch b/patches/server/0074-Fix-MC-238526.patch similarity index 100% rename from patches/server/0076-Fix-MC-238526.patch rename to patches/server/0074-Fix-MC-238526.patch diff --git a/patches/server/0077-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0075-Fix-cow-rotation-when-shearing-mooshroom.patch similarity index 100% rename from patches/server/0077-Fix-cow-rotation-when-shearing-mooshroom.patch rename to patches/server/0075-Fix-cow-rotation-when-shearing-mooshroom.patch diff --git a/patches/server/0078-Fix-MC-121706.patch b/patches/server/0076-Fix-MC-121706.patch similarity index 100% rename from patches/server/0078-Fix-MC-121706.patch rename to patches/server/0076-Fix-MC-121706.patch diff --git a/patches/server/0079-Fix-MC-110386.patch b/patches/server/0077-Fix-MC-110386.patch similarity index 100% rename from patches/server/0079-Fix-MC-110386.patch rename to patches/server/0077-Fix-MC-110386.patch diff --git a/patches/server/0080-Fix-MC-31819.patch b/patches/server/0078-Fix-MC-31819.patch similarity index 100% rename from patches/server/0080-Fix-MC-31819.patch rename to patches/server/0078-Fix-MC-31819.patch diff --git a/patches/server/0081-Fix-MC-26304.patch b/patches/server/0079-Fix-MC-26304.patch similarity index 100% rename from patches/server/0081-Fix-MC-26304.patch rename to patches/server/0079-Fix-MC-26304.patch diff --git a/patches/server/0082-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0080-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 100% rename from patches/server/0082-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0080-End-gateway-should-check-if-entity-can-use-portal.patch diff --git a/patches/server/0083-Make-arrow-movement-resetting-despawn-counter-config.patch b/patches/server/0081-Make-arrow-movement-resetting-despawn-counter-config.patch similarity index 100% rename from patches/server/0083-Make-arrow-movement-resetting-despawn-counter-config.patch rename to patches/server/0081-Make-arrow-movement-resetting-despawn-counter-config.patch diff --git a/patches/server/0084-Make-logging-login-locations-configurable.patch b/patches/server/0082-Make-logging-login-locations-configurable.patch similarity index 100% rename from patches/server/0084-Make-logging-login-locations-configurable.patch rename to patches/server/0082-Make-logging-login-locations-configurable.patch diff --git a/patches/server/0085-Reduce-array-allocations.patch b/patches/server/0083-Reduce-array-allocations.patch similarity index 99% rename from patches/server/0085-Reduce-array-allocations.patch rename to patches/server/0083-Reduce-array-allocations.patch index 3588b7e..4508bed 100644 --- a/patches/server/0085-Reduce-array-allocations.patch +++ b/patches/server/0083-Reduce-array-allocations.patch @@ -346,7 +346,7 @@ index a2920b8a9eff77d9c5d1d7f70ad3abdacba8f0fa..43f402d9032e4570a81a80e412215598 protected CipherBase(Cipher cipher) { this.cipher = cipher; diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java -index cf20f0983fc25b26cf92b9d3a28746b1909fc56b..f20738fbfbc85a73e43898ec2b15c3a834ba7099 100644 +index 52cb6476604c98465f81ff9e8d8344d7536a8868..98aa13ba9b5d2ac6ddac8e825f76e3c6211dc0d2 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java @@ -21,7 +21,6 @@ import io.netty.channel.epoll.EpollSocketChannel; @@ -399,7 +399,7 @@ index 8a68baf6bd46b59cf57c94ffe5651d47a7cae99c..bd7fa1b2a6fed82ce66fe2b8e3498e4d private static final FormattedText TEXT_NULL = FormattedText.of("null"); private final String key; diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index dae36c6452ccd57a436dd918547b64d59957ab0a..f06cafd80d7c027ca97e50bcb45ad520d17c7e55 100644 +index a7ebf851a65231074c89a24f30de4ac2fb5b63e4..cb4a30bdf9beb4b1296ff47a6f6f299f0534b481 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java @@ -93,7 +93,7 @@ public class Main { @@ -680,7 +680,7 @@ index 97ff19efa0b3943ccb7a6e02cba6ed2fea61adac..b2ae2bd8bd4ff3cb6457e8c08172e348 private EquipmentSlot(EquipmentSlot.Type type, int entityId, int armorStandId, String name) { this.type = type; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 559e85f266614f08e5b383e41f9898b2cca28513..506cbd835df841608d0d26a2a9313ee3434bf1ab 100644 +index 597866e969e0f5deddaaaedd9b1618edd507bae9..d1267b31ec49d3b0faf1fab57fe53f3058ccca21 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3099,7 +3099,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -798,7 +798,7 @@ index 2bfbdaeb2b0d99dfd956cd5936403fe8b0eeae64..84f1c4c3ded4f201899f3c74e639349b public Enchantments() {} diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index db481e39fca1d6fd6dcd0c076f413b0f191fb0b3..8e84db48bb2658ce9d24c31f413aa23924839731 100644 +index 761e3c07726bdead7acf9769b9a973750b7d0335..aaa83188bc5c9da1ab7a50bd3f97a420e242a714 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -12,6 +12,8 @@ import java.util.function.Consumer; @@ -810,7 +810,7 @@ index db481e39fca1d6fd6dcd0c076f413b0f191fb0b3..8e84db48bb2658ce9d24c31f413aa239 import net.minecraft.CrashReport; import net.minecraft.CrashReportCategory; import net.minecraft.core.BlockPos; -@@ -1518,7 +1520,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1517,7 +1519,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { public org.bukkit.entity.Entity[] getChunkEntities(int chunkX, int chunkZ) { io.papermc.paper.world.ChunkEntitySlices slices = ((ServerLevel)this).getEntityLookup().getChunk(chunkX, chunkZ); if (slices == null) { diff --git a/patches/server/0086-Optimize-sun-burn-tick.patch b/patches/server/0084-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0086-Optimize-sun-burn-tick.patch rename to patches/server/0084-Optimize-sun-burn-tick.patch diff --git a/patches/server/0087-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0085-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from patches/server/0087-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to patches/server/0085-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/patches/server/0088-Replace-AI-goal-set-with-optimized-collection.patch b/patches/server/0086-Replace-AI-goal-set-with-optimized-collection.patch similarity index 100% rename from patches/server/0088-Replace-AI-goal-set-with-optimized-collection.patch rename to patches/server/0086-Replace-AI-goal-set-with-optimized-collection.patch diff --git a/patches/server/0089-Replace-game-rules-map-with-optimized-collection.patch b/patches/server/0087-Replace-game-rules-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0089-Replace-game-rules-map-with-optimized-collection.patch rename to patches/server/0087-Replace-game-rules-map-with-optimized-collection.patch diff --git a/patches/server/0090-Replace-AI-attributes-with-optimized-collections.patch b/patches/server/0088-Replace-AI-attributes-with-optimized-collections.patch similarity index 100% rename from patches/server/0090-Replace-AI-attributes-with-optimized-collections.patch rename to patches/server/0088-Replace-AI-attributes-with-optimized-collections.patch diff --git a/patches/server/0091-Replace-class-map-with-optimized-collection.patch b/patches/server/0089-Replace-class-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0091-Replace-class-map-with-optimized-collection.patch rename to patches/server/0089-Replace-class-map-with-optimized-collection.patch diff --git a/patches/server/0092-Replace-throttle-tracker-map-with-optimized-collecti.patch b/patches/server/0090-Replace-throttle-tracker-map-with-optimized-collecti.patch similarity index 100% rename from patches/server/0092-Replace-throttle-tracker-map-with-optimized-collecti.patch rename to patches/server/0090-Replace-throttle-tracker-map-with-optimized-collecti.patch diff --git a/patches/server/0093-Replace-shape-full-block-cache-with-hashtable.patch b/patches/server/0091-Replace-shape-full-block-cache-with-hashtable.patch similarity index 100% rename from patches/server/0093-Replace-shape-full-block-cache-with-hashtable.patch rename to patches/server/0091-Replace-shape-full-block-cache-with-hashtable.patch diff --git a/patches/server/0094-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0092-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from patches/server/0094-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to patches/server/0092-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/patches/server/0095-Cache-BlockStatePairKey-hash.patch b/patches/server/0093-Cache-BlockStatePairKey-hash.patch similarity index 100% rename from patches/server/0095-Cache-BlockStatePairKey-hash.patch rename to patches/server/0093-Cache-BlockStatePairKey-hash.patch diff --git a/patches/server/0096-Cache-CubeVoxelShape-shape-array.patch b/patches/server/0094-Cache-CubeVoxelShape-shape-array.patch similarity index 100% rename from patches/server/0096-Cache-CubeVoxelShape-shape-array.patch rename to patches/server/0094-Cache-CubeVoxelShape-shape-array.patch diff --git a/patches/server/0097-Replace-division-by-multiplication-in-CubePointRange.patch b/patches/server/0095-Replace-division-by-multiplication-in-CubePointRange.patch similarity index 100% rename from patches/server/0097-Replace-division-by-multiplication-in-CubePointRange.patch rename to patches/server/0095-Replace-division-by-multiplication-in-CubePointRange.patch diff --git a/patches/server/0098-Replace-parts-by-size-in-CubePointRange.patch b/patches/server/0096-Replace-parts-by-size-in-CubePointRange.patch similarity index 100% rename from patches/server/0098-Replace-parts-by-size-in-CubePointRange.patch rename to patches/server/0096-Replace-parts-by-size-in-CubePointRange.patch diff --git a/patches/server/0099-Check-frozen-ticks-before-landing-block.patch b/patches/server/0097-Check-frozen-ticks-before-landing-block.patch similarity index 95% rename from patches/server/0099-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0097-Check-frozen-ticks-before-landing-block.patch index 90c9b94..7877eb2 100644 --- a/patches/server/0099-Check-frozen-ticks-before-landing-block.patch +++ b/patches/server/0097-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/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 506cbd835df841608d0d26a2a9313ee3434bf1ab..2f252bbe2946ea3228933b4b8c91a4e46fe99705 100644 +index d1267b31ec49d3b0faf1fab57fe53f3058ccca21..c7e0aa9ea247a14441858c4d4d03151e4c61abdd 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -583,11 +583,10 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0100-Faster-chunk-serialization.patch b/patches/server/0098-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0100-Faster-chunk-serialization.patch rename to patches/server/0098-Faster-chunk-serialization.patch diff --git a/patches/server/0101-Update-boss-bar-within-tick.patch b/patches/server/0099-Update-boss-bar-within-tick.patch similarity index 100% rename from patches/server/0101-Update-boss-bar-within-tick.patch rename to patches/server/0099-Update-boss-bar-within-tick.patch diff --git a/patches/server/0102-Cache-ominous-banner-item.patch b/patches/server/0100-Cache-ominous-banner-item.patch similarity index 100% rename from patches/server/0102-Cache-ominous-banner-item.patch rename to patches/server/0100-Cache-ominous-banner-item.patch diff --git a/patches/server/0103-Optimize-world-generation-chunk-and-block-access.patch b/patches/server/0101-Optimize-world-generation-chunk-and-block-access.patch similarity index 100% rename from patches/server/0103-Optimize-world-generation-chunk-and-block-access.patch rename to patches/server/0101-Optimize-world-generation-chunk-and-block-access.patch diff --git a/patches/server/0104-Cache-world-generator-sea-level.patch b/patches/server/0102-Cache-world-generator-sea-level.patch similarity index 100% rename from patches/server/0104-Cache-world-generator-sea-level.patch rename to patches/server/0102-Cache-world-generator-sea-level.patch diff --git a/patches/server/0105-Skip-secondary-POI-sensor-if-absent.patch b/patches/server/0103-Skip-secondary-POI-sensor-if-absent.patch similarity index 100% rename from patches/server/0105-Skip-secondary-POI-sensor-if-absent.patch rename to patches/server/0103-Skip-secondary-POI-sensor-if-absent.patch diff --git a/patches/server/0106-Optimize-villager-data-storage.patch b/patches/server/0104-Optimize-villager-data-storage.patch similarity index 100% rename from patches/server/0106-Optimize-villager-data-storage.patch rename to patches/server/0104-Optimize-villager-data-storage.patch diff --git a/patches/server/0107-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0105-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0107-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0105-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0108-Store-mob-counts-in-an-array.patch b/patches/server/0106-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0108-Store-mob-counts-in-an-array.patch rename to patches/server/0106-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0109-Use-linked-map-for-entity-trackers.patch b/patches/server/0107-Use-linked-map-for-entity-trackers.patch similarity index 100% rename from patches/server/0109-Use-linked-map-for-entity-trackers.patch rename to patches/server/0107-Use-linked-map-for-entity-trackers.patch diff --git a/patches/server/0110-Optimize-noise-generation.patch b/patches/server/0108-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0110-Optimize-noise-generation.patch rename to patches/server/0108-Optimize-noise-generation.patch diff --git a/patches/server/0111-Optimize-sheep-offspring-color.patch b/patches/server/0109-Optimize-sheep-offspring-color.patch similarity index 100% rename from patches/server/0111-Optimize-sheep-offspring-color.patch rename to patches/server/0109-Optimize-sheep-offspring-color.patch diff --git a/patches/server/0112-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0110-Hide-flames-on-entities-with-fire-resistance.patch similarity index 100% rename from patches/server/0112-Hide-flames-on-entities-with-fire-resistance.patch rename to patches/server/0110-Hide-flames-on-entities-with-fire-resistance.patch diff --git a/patches/server/0113-Skip-cloning-advancement-criteria.patch b/patches/server/0111-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0113-Skip-cloning-advancement-criteria.patch rename to patches/server/0111-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0114-Reduce-block-destruction-packet-allocations.patch b/patches/server/0112-Reduce-block-destruction-packet-allocations.patch similarity index 100% rename from patches/server/0114-Reduce-block-destruction-packet-allocations.patch rename to patches/server/0112-Reduce-block-destruction-packet-allocations.patch diff --git a/patches/server/0115-Spread-out-sending-all-player-info.patch b/patches/server/0113-Spread-out-sending-all-player-info.patch similarity index 100% rename from patches/server/0115-Spread-out-sending-all-player-info.patch rename to patches/server/0113-Spread-out-sending-all-player-info.patch diff --git a/patches/server/0116-Optimize-player-list-for-sending-player-info.patch b/patches/server/0114-Optimize-player-list-for-sending-player-info.patch similarity index 100% rename from patches/server/0116-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0114-Optimize-player-list-for-sending-player-info.patch diff --git a/patches/server/0117-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0115-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0117-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0115-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0118-Send-multiple-keep-alive-packets.patch b/patches/server/0116-Send-multiple-keep-alive-packets.patch similarity index 100% rename from patches/server/0118-Send-multiple-keep-alive-packets.patch rename to patches/server/0116-Send-multiple-keep-alive-packets.patch diff --git a/patches/server/0119-Make-slow-login-timeout-configurable.patch b/patches/server/0117-Make-slow-login-timeout-configurable.patch similarity index 100% rename from patches/server/0119-Make-slow-login-timeout-configurable.patch rename to patches/server/0117-Make-slow-login-timeout-configurable.patch diff --git a/patches/server/0120-Make-max-interaction-distance-configurable.patch b/patches/server/0118-Make-max-interaction-distance-configurable.patch similarity index 100% rename from patches/server/0120-Make-max-interaction-distance-configurable.patch rename to patches/server/0118-Make-max-interaction-distance-configurable.patch diff --git a/patches/server/0121-Load-portal-destination-chunk-before-entity-teleport.patch b/patches/server/0119-Load-portal-destination-chunk-before-entity-teleport.patch similarity index 100% rename from patches/server/0121-Load-portal-destination-chunk-before-entity-teleport.patch rename to patches/server/0119-Load-portal-destination-chunk-before-entity-teleport.patch diff --git a/patches/server/0122-Don-t-load-chunks-to-spawn-phantoms.patch b/patches/server/0120-Don-t-load-chunks-to-spawn-phantoms.patch similarity index 100% rename from patches/server/0122-Don-t-load-chunks-to-spawn-phantoms.patch rename to patches/server/0120-Don-t-load-chunks-to-spawn-phantoms.patch diff --git a/patches/server/0123-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0121-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 97% rename from patches/server/0123-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0121-Don-t-load-chunks-to-activate-climbing-entities.patch index dbbafed..8c105ab 100644 --- a/patches/server/0123-Don-t-load-chunks-to-activate-climbing-entities.patch +++ b/patches/server/0121-Don-t-load-chunks-to-activate-climbing-entities.patch @@ -28,7 +28,7 @@ index 286356ccb4f6938a857a58d4478f00aa84f00ee1..206f8e45b3ba1c0b1f25246b61cb6a2d return this.chunkPosition; } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 2f252bbe2946ea3228933b4b8c91a4e46fe99705..a35891723fad4fe984566c41cdd728004f8f371e 100644 +index c7e0aa9ea247a14441858c4d4d03151e4c61abdd..3ead02cf0b5ddbaeb8ac99c30c90753d94dafd22 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1979,19 +1979,43 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0124-Broadcast-crit-animations-as-the-entity-being-critte.patch b/patches/server/0122-Broadcast-crit-animations-as-the-entity-being-critte.patch similarity index 100% rename from patches/server/0124-Broadcast-crit-animations-as-the-entity-being-critte.patch rename to patches/server/0122-Broadcast-crit-animations-as-the-entity-being-critte.patch diff --git a/patches/server/0125-Ignore-null-legacy-structure-data.patch b/patches/server/0123-Ignore-null-legacy-structure-data.patch similarity index 100% rename from patches/server/0125-Ignore-null-legacy-structure-data.patch rename to patches/server/0123-Ignore-null-legacy-structure-data.patch diff --git a/patches/server/0126-Skip-unnecessary-mob-spawning-computations.patch b/patches/server/0124-Skip-unnecessary-mob-spawning-computations.patch similarity index 100% rename from patches/server/0126-Skip-unnecessary-mob-spawning-computations.patch rename to patches/server/0124-Skip-unnecessary-mob-spawning-computations.patch diff --git a/patches/server/0127-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0125-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 100% rename from patches/server/0127-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to patches/server/0125-Prevent-entities-random-strolling-into-non-ticking-c.patch diff --git a/patches/server/0128-Do-not-place-player-in-world-if-kicked-before-being-.patch b/patches/server/0126-Do-not-place-player-in-world-if-kicked-before-being-.patch similarity index 100% rename from patches/server/0128-Do-not-place-player-in-world-if-kicked-before-being-.patch rename to patches/server/0126-Do-not-place-player-in-world-if-kicked-before-being-.patch diff --git a/patches/server/0129-CraftBukkit-UUID-to-world-map.patch b/patches/server/0127-CraftBukkit-UUID-to-world-map.patch similarity index 100% rename from patches/server/0129-CraftBukkit-UUID-to-world-map.patch rename to patches/server/0127-CraftBukkit-UUID-to-world-map.patch diff --git a/patches/server/0130-Global-EULA-file.patch b/patches/server/0128-Global-EULA-file.patch similarity index 100% rename from patches/server/0130-Global-EULA-file.patch rename to patches/server/0128-Global-EULA-file.patch diff --git a/patches/server/0131-Specific-interval-TPS-API.patch b/patches/server/0129-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0131-Specific-interval-TPS-API.patch rename to patches/server/0129-Specific-interval-TPS-API.patch diff --git a/patches/server/0132-5-second-TPS-average.patch b/patches/server/0130-5-second-TPS-average.patch similarity index 100% rename from patches/server/0132-5-second-TPS-average.patch rename to patches/server/0130-5-second-TPS-average.patch diff --git a/patches/server/0133-Measure-last-tick-time.patch b/patches/server/0131-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0133-Measure-last-tick-time.patch rename to patches/server/0131-Measure-last-tick-time.patch diff --git a/patches/server/0134-Last-tick-time-API.patch b/patches/server/0132-Last-tick-time-API.patch similarity index 100% rename from patches/server/0134-Last-tick-time-API.patch rename to patches/server/0132-Last-tick-time-API.patch diff --git a/patches/server/0135-Show-last-tick-time-in-tps-command.patch b/patches/server/0133-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0135-Show-last-tick-time-in-tps-command.patch rename to patches/server/0133-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0136-Increase-time-statistics-in-intervals.patch b/patches/server/0134-Increase-time-statistics-in-intervals.patch similarity index 100% rename from patches/server/0136-Increase-time-statistics-in-intervals.patch rename to patches/server/0134-Increase-time-statistics-in-intervals.patch diff --git a/patches/server/0137-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0135-For-collision-check-has-physics-before-same-vehicle.patch similarity index 100% rename from patches/server/0137-For-collision-check-has-physics-before-same-vehicle.patch rename to patches/server/0135-For-collision-check-has-physics-before-same-vehicle.patch diff --git a/patches/server/0138-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0136-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from patches/server/0138-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0136-Skip-negligible-planar-movement-multiplication.patch diff --git a/patches/server/0139-Optimize-matching-item-checks.patch b/patches/server/0137-Optimize-matching-item-checks.patch similarity index 100% rename from patches/server/0139-Optimize-matching-item-checks.patch rename to patches/server/0137-Optimize-matching-item-checks.patch diff --git a/patches/server/0140-Pre-compute-VarInt-and-VarLong-sizes.patch b/patches/server/0138-Pre-compute-VarInt-and-VarLong-sizes.patch similarity index 100% rename from patches/server/0140-Pre-compute-VarInt-and-VarLong-sizes.patch rename to patches/server/0138-Pre-compute-VarInt-and-VarLong-sizes.patch diff --git a/patches/server/0141-Optimize-FriendlyByteBuf-writeVarInt-and-FriendlyByt.patch b/patches/server/0139-Optimize-FriendlyByteBuf-writeVarInt-and-FriendlyByt.patch similarity index 100% rename from patches/server/0141-Optimize-FriendlyByteBuf-writeVarInt-and-FriendlyByt.patch rename to patches/server/0139-Optimize-FriendlyByteBuf-writeVarInt-and-FriendlyByt.patch diff --git a/patches/server/0142-Reduce-RandomSource-instances.patch b/patches/server/0140-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0142-Reduce-RandomSource-instances.patch rename to patches/server/0140-Reduce-RandomSource-instances.patch diff --git a/patches/server/0143-Add-xor-shift-random.patch b/patches/server/0141-Add-xor-shift-random.patch similarity index 100% rename from patches/server/0143-Add-xor-shift-random.patch rename to patches/server/0141-Add-xor-shift-random.patch diff --git a/patches/server/0144-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch b/patches/server/0142-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch similarity index 95% rename from patches/server/0144-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch rename to patches/server/0142-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch index 4e65cc5..4e7ec40 100644 --- a/patches/server/0144-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch +++ b/patches/server/0142-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch @@ -18,7 +18,7 @@ this patch is focused around the sensors used for ai delete the line of sight cache less often and use a faster nearby comparison diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index a35891723fad4fe984566c41cdd728004f8f371e..a30beddd896b8d36c48d442871818327a7e4810d 100644 +index 3ead02cf0b5ddbaeb8ac99c30c90753d94dafd22..75a06dec69ee79af5b321388b104bf1cb6acf83c 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1023,10 +1023,9 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0145-Initialize-line-of-sight-cache-with-low-capacity.patch b/patches/server/0143-Initialize-line-of-sight-cache-with-low-capacity.patch similarity index 100% rename from patches/server/0145-Initialize-line-of-sight-cache-with-low-capacity.patch rename to patches/server/0143-Initialize-line-of-sight-cache-with-low-capacity.patch diff --git a/patches/server/0146-Reduce-line-of-sight-updates-and-cache-lookups.patch b/patches/server/0144-Reduce-line-of-sight-updates-and-cache-lookups.patch similarity index 100% rename from patches/server/0146-Reduce-line-of-sight-updates-and-cache-lookups.patch rename to patches/server/0144-Reduce-line-of-sight-updates-and-cache-lookups.patch diff --git a/patches/server/0147-Server-thread-priority-environment-variable.patch b/patches/server/0145-Server-thread-priority-environment-variable.patch similarity index 100% rename from patches/server/0147-Server-thread-priority-environment-variable.patch rename to patches/server/0145-Server-thread-priority-environment-variable.patch diff --git a/patches/server/0148-Instantly-continue-on-world-upgrade-finish.patch b/patches/server/0146-Instantly-continue-on-world-upgrade-finish.patch similarity index 100% rename from patches/server/0148-Instantly-continue-on-world-upgrade-finish.patch rename to patches/server/0146-Instantly-continue-on-world-upgrade-finish.patch diff --git a/patches/server/0149-Virtual-thread-support.patch b/patches/server/0147-Virtual-thread-support.patch similarity index 100% rename from patches/server/0149-Virtual-thread-support.patch rename to patches/server/0147-Virtual-thread-support.patch