diff --git a/README.md b/README.md index ea0a3eb..1ab4a43 100644 --- a/README.md +++ b/README.md @@ -42,8 +42,9 @@ Of course, this fork would not exist without the years-long work of all the cont Additional thanks and friendly greetings go out to the following forks and other projects, for their code, shared knowledge or generous support: * [Airplane](https://github.com/TECHNOVE/Airplane) * [Purpur](https://github.com/PurpurMC/Purpur) -* [Mirai](https://github.com/etil2jz/Mirai) * [Leaf](https://github.com/Winds-Studio/Leaf) +* [Mirai](https://github.com/etil2jz/Mirai) +* [Kaiiju](https://github.com/KaiijuMC/Kaiiju) * [KeYi](https://github.com/MC-Multithreading-Lab/KeYi-MT) * [EmpireCraft](https://github.com/starlis/empirecraft) * [Slice](https://github.com/Cryptite/Slice) @@ -52,7 +53,6 @@ Additional thanks and friendly greetings go out to the following forks and other * [VMP](https://github.com/RelativityMC/VMP-fabric) * [C2ME](https://github.com/RelativityMC/C2ME-fabric) * [MultiPaper](https://github.com/MultiPaper/MultiPaper) -* [Patina](https://github.com/PatinaMC/Patina) * MCMT ([Fabric](https://github.com/himekifee/MCMTFabric), [Forge](https://github.com/jediminer543/JMT-MCMT)) ## License diff --git a/patches/server/0018-Use-platform-math-functions.patch b/patches/server/0018-Use-platform-math-functions.patch new file mode 100644 index 0000000..e2e676c --- /dev/null +++ b/patches/server/0018-Use-platform-math-functions.patch @@ -0,0 +1,187 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Martijn Muijsers +Date: Tue, 8 Aug 2023 20:43:20 +0200 +Subject: [PATCH] Use platform math functions + +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: +"Use Math.floor instead of fastfloor" +By: Xymb +As part of: Kaiiju (https://github.com/KaiijuMC/Kaiiju) +Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) + +* Comparison of floor methods used in Paper * + +Measure shown is floored number of milliseconds +(nanoseconds integer-divided by 1_000_000 +taken to get the floor of 1000 randomly chosen doubles +(all in the range of [-Integer.MAX_VALUE + 10, Integer.MAX_VALUE - 10]) +100_000 times (making it 100_000_000 floor operations total) +and adding it to a total. + +We are testing the following methods: +* net.minecraft.util.Mth.floor +* java.lang.Math.floor +* java.lang.StrictMath.floor +* org.apache.commons.math3.util.FastMath.floor +* org.apache.commons.math3.util.FastMath.floor, but with a hot start (see comment in code) +* io.papermc.paper.util.MCUtil.fastFloor + +The tests performed clearly show that Math.floor is the fastest. +This is most likely due to java.lang.Math's usage of the @IntrinsicCandidate +annotation, which allows the JVM to use a more optimized implementation at runtime. +However, in the case that there is no intrinsic replacement for Math.floor, +it defers to StrictMath.floor, which relies on a number of native methods, and is +still much faster than the existing Minecraft utility functions. +Therefore, using Math.floor instead of these functions is better regardless. +In Apache Commons Math 4, FastMath.floor has also been removed in favor of Math.floor. + +The versions used: +* Windows 10 Home 21H2 19044.3086 +* OpenJDK Runtime Environment Temurin-19.0.2+7 (build 19.0.2+7) +* Paper a3c760e6af1e8c7244ef75c6da6e6df278a79e14 on Minecraft 1.20.1 +* Apache Commons Math 3.6.1 + +Results: +Total is of type int Total is of type double +---------------------------------------------------------------------------------- +Mth.floor 2113 (double) Mth.floor 2658 +(int) Math.floor 130 Math.floor 194 +(int) StrictMath.floor 835 StrictMath.floor 381 +(int) FastMath.floor 412 FastMath.floor 376 +(int) FastMath.floor with hot start 359 FastMath.floor with hot start 321 +MCUtil.fastFloor 2284 (double) MCUtil.fastFloor 2469 + +Code is below: +```java +package somepackage; + +import io.papermc.paper.util.MCUtil; +import net.minecraft.util.Mth; + +import java.util.Random; + +public class Main { + + public static void main(String[] args) { + + // IF FastMath.floor with a hot start: + // FastMath.floor(37485.5); + + var random = new Random(4889338); + int size = 1000; + var values = new double[size]; + double bound = Integer.MAX_VALUE - 10; + for (int i = 0; i < size; i++) { + values[i] = random.nextDouble(bound * 2) - bound; + } + int repeats = 100_000; + + // int total = 0; + // OR + // double total = 0; + + long start = System.nanoTime(); + for (int repeat = 0; repeat < repeats; repeat++) { + for (int index = 0; index < size; index++) { + total += insert_function_being_tested_here(values[index]); + } + } + long diff = System.nanoTime() - start; + System.out.println(total); + System.out.println(diff / 1_000_000L); + + } + +} +``` + +diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java +index cb4379268b191d331c71be44642baac381ffaaf6..517ea24ed254eaa9c13439b8b83e8391ea5e10ff 100644 +--- a/src/main/java/io/papermc/paper/util/MCUtil.java ++++ b/src/main/java/io/papermc/paper/util/MCUtil.java +@@ -164,13 +164,11 @@ public final class MCUtil { + } + + public static int fastFloor(double x) { +- int truncated = (int)x; +- return x < (double)truncated ? truncated - 1 : truncated; ++ return (int) Math.floor(x); // Gale - use platform math functions + } + + public static int fastFloor(float x) { +- int truncated = (int)x; +- return x < (double)truncated ? truncated - 1 : truncated; ++ return (int) Math.floor(x); // Gale - use platform math functions + } + + public static float normalizeYaw(float f) { +@@ -231,11 +229,11 @@ public final class MCUtil { + } + + public static int getChunkCoordinate(final double coordinate) { +- return MCUtil.fastFloor(coordinate) >> 4; ++ return ((int) Math.floor(coordinate)) >> 4; // Gale - use platform math functions + } + + public static int getBlockCoordinate(final double coordinate) { +- return MCUtil.fastFloor(coordinate); ++ return (int) Math.floor(coordinate); // Gale - use platform math functions + } + + public static long getBlockKey(final int x, final int y, final int z) { +diff --git a/src/main/java/net/minecraft/util/Mth.java b/src/main/java/net/minecraft/util/Mth.java +index 9084754103e948a02e68ee82336047e48e741438..7327f3bb1c1f764ae1da88af27b1e9fb03fb89d9 100644 +--- a/src/main/java/net/minecraft/util/Mth.java ++++ b/src/main/java/net/minecraft/util/Mth.java +@@ -51,13 +51,11 @@ public class Mth { + } + + public static int floor(float value) { +- int i = (int)value; +- return value < (float)i ? i - 1 : i; ++ return (int) Math.floor(value); // Gale - use platform math functions + } + + public static int floor(double value) { +- int i = (int)value; +- return value < (double)i ? i - 1 : i; ++ return (int) Math.floor(value); // Gale - use platform math functions + } + + public static long lfloor(double value) { +@@ -74,13 +72,11 @@ public class Mth { + } + + public static int ceil(float value) { +- int i = (int)value; +- return value > (float)i ? i + 1 : i; ++ return (int) Math.ceil(value); // Gale - use platform math functions + } + + public static int ceil(double value) { +- int i = (int)value; +- return value > (double)i ? i + 1 : i; ++ return (int) Math.ceil(value); // Gale - use platform math functions + } + + public static int clamp(int value, int min, int max) { +@@ -112,15 +108,7 @@ public class Mth { + } + + public static double absMax(double a, double b) { +- if (a < 0.0D) { +- a = -a; +- } +- +- if (b < 0.0D) { +- b = -b; +- } +- +- return Math.max(a, b); ++ return Math.max(Math.abs(a), Math.abs(b)); // Gale - use platform math functions + } + + public static int floorDiv(int dividend, int divisor) { diff --git a/patches/server/0018-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0019-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch similarity index 100% rename from patches/server/0018-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch rename to patches/server/0019-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch diff --git a/patches/server/0019-Simpler-ShapelessRecipe-comparison-for-vanilla.patch b/patches/server/0020-Simpler-ShapelessRecipe-comparison-for-vanilla.patch similarity index 98% rename from patches/server/0019-Simpler-ShapelessRecipe-comparison-for-vanilla.patch rename to patches/server/0020-Simpler-ShapelessRecipe-comparison-for-vanilla.patch index 54f0a3c..d18d6e3 100644 --- a/patches/server/0019-Simpler-ShapelessRecipe-comparison-for-vanilla.patch +++ b/patches/server/0020-Simpler-ShapelessRecipe-comparison-for-vanilla.patch @@ -37,7 +37,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/item/crafting/ShapelessRecipe.java b/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java -index f4f3f3a19d3cadaef1ae1a47daa68251a983dcf2..04f8e7709c52654241ff5f9403e2d58e42b47550 100644 +index 7f174bb89bf4d700a5ae1b65d8abd4f5b1e7b5ed..7420f51ad52d233330fc9313fc08611917876788 100644 --- a/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java +++ b/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java @@ -27,8 +27,15 @@ public class ShapelessRecipe implements CraftingRecipe { diff --git a/patches/server/0020-Reduce-projectile-chunk-loading.patch b/patches/server/0021-Reduce-projectile-chunk-loading.patch similarity index 100% rename from patches/server/0020-Reduce-projectile-chunk-loading.patch rename to patches/server/0021-Reduce-projectile-chunk-loading.patch diff --git a/patches/server/0021-Predict-Halloween.patch b/patches/server/0022-Predict-Halloween.patch similarity index 100% rename from patches/server/0021-Predict-Halloween.patch rename to patches/server/0022-Predict-Halloween.patch diff --git a/patches/server/0022-Move-random-tick-random.patch b/patches/server/0023-Move-random-tick-random.patch similarity index 100% rename from patches/server/0022-Move-random-tick-random.patch rename to patches/server/0023-Move-random-tick-random.patch diff --git a/patches/server/0023-Optimize-random-calls-in-chunk-ticking.patch b/patches/server/0024-Optimize-random-calls-in-chunk-ticking.patch similarity index 100% rename from patches/server/0023-Optimize-random-calls-in-chunk-ticking.patch rename to patches/server/0024-Optimize-random-calls-in-chunk-ticking.patch diff --git a/patches/server/0024-Reduce-enderman-teleport-chunk-lookups.patch b/patches/server/0025-Reduce-enderman-teleport-chunk-lookups.patch similarity index 96% rename from patches/server/0024-Reduce-enderman-teleport-chunk-lookups.patch rename to patches/server/0025-Reduce-enderman-teleport-chunk-lookups.patch index 6c530a6..38fa9ec 100644 --- a/patches/server/0024-Reduce-enderman-teleport-chunk-lookups.patch +++ b/patches/server/0025-Reduce-enderman-teleport-chunk-lookups.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/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java -index 39eb9301626b191958ce42daa34b1ff3241cea80..926098ec96fb1b6ea58403921ab49a21b7a51e76 100644 +index b62457313a1e30aad0c5313d608667b5d3811455..52ae9e64b7d78b76214c6c4c8616a8d091bf3bc9 100644 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java @@ -326,11 +326,17 @@ public class EnderMan extends Monster implements NeutralMob { diff --git a/patches/server/0025-Reduce-acquire-POI-for-stuck-entities.patch b/patches/server/0026-Reduce-acquire-POI-for-stuck-entities.patch similarity index 100% rename from patches/server/0025-Reduce-acquire-POI-for-stuck-entities.patch rename to patches/server/0026-Reduce-acquire-POI-for-stuck-entities.patch diff --git a/patches/server/0026-Remove-iterators-from-Inventory-contains.patch b/patches/server/0027-Remove-iterators-from-Inventory-contains.patch similarity index 100% rename from patches/server/0026-Remove-iterators-from-Inventory-contains.patch rename to patches/server/0027-Remove-iterators-from-Inventory-contains.patch diff --git a/patches/server/0027-Check-targeting-range-before-getting-visibility.patch b/patches/server/0028-Check-targeting-range-before-getting-visibility.patch similarity index 96% rename from patches/server/0027-Check-targeting-range-before-getting-visibility.patch rename to patches/server/0028-Check-targeting-range-before-getting-visibility.patch index c256da5..3a75a96 100644 --- a/patches/server/0027-Check-targeting-range-before-getting-visibility.patch +++ b/patches/server/0028-Check-targeting-range-before-getting-visibility.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/targeting/TargetingConditions.java b/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java -index a7575b5ef56af6f53448d391abb4956e130148ca..58c3b8e622941108e46bb1b4e9eb9497d6553ab4 100644 +index 58422f00c7d64dbd1cf6d7211c9838875cbe7778..57bd0b2d01c92f08cc41db59b38641a82653af0e 100644 --- a/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java +++ b/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java @@ -75,9 +75,18 @@ public class TargetingConditions { diff --git a/patches/server/0028-Print-stack-trace-for-plugins-not-shutting-down-task.patch b/patches/server/0029-Print-stack-trace-for-plugins-not-shutting-down-task.patch similarity index 100% rename from patches/server/0028-Print-stack-trace-for-plugins-not-shutting-down-task.patch rename to patches/server/0029-Print-stack-trace-for-plugins-not-shutting-down-task.patch diff --git a/patches/server/0029-Improve-fluid-direction-caching.patch b/patches/server/0030-Improve-fluid-direction-caching.patch similarity index 100% rename from patches/server/0029-Improve-fluid-direction-caching.patch rename to patches/server/0030-Improve-fluid-direction-caching.patch diff --git a/patches/server/0030-Cache-on-climbable-check.patch b/patches/server/0031-Cache-on-climbable-check.patch similarity index 100% rename from patches/server/0030-Cache-on-climbable-check.patch rename to patches/server/0031-Cache-on-climbable-check.patch diff --git a/patches/server/0031-Make-EntityCollisionContext-a-live-representation.patch b/patches/server/0032-Make-EntityCollisionContext-a-live-representation.patch similarity index 100% rename from patches/server/0031-Make-EntityCollisionContext-a-live-representation.patch rename to patches/server/0032-Make-EntityCollisionContext-a-live-representation.patch diff --git a/patches/server/0032-Improve-container-checking-with-a-bitset.patch b/patches/server/0033-Improve-container-checking-with-a-bitset.patch similarity index 100% rename from patches/server/0032-Improve-container-checking-with-a-bitset.patch rename to patches/server/0033-Improve-container-checking-with-a-bitset.patch diff --git a/patches/server/0033-Better-checking-for-useless-move-packets.patch b/patches/server/0034-Better-checking-for-useless-move-packets.patch similarity index 96% rename from patches/server/0033-Better-checking-for-useless-move-packets.patch rename to patches/server/0034-Better-checking-for-useless-move-packets.patch index b2936ee..7f2cf99 100644 --- a/patches/server/0033-Better-checking-for-useless-move-packets.patch +++ b/patches/server/0034-Better-checking-for-useless-move-packets.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/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java -index 6670e657e08e130f7e0368f418379fd1ece00cdf..1717844256fe6479e3d7125db3937354578d17d0 100644 +index d934d07ad761319f338d4386536f68fde211c041..e215cb22a226fa61d7eb9a8f69fe2a644d4394f7 100644 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java @@ -181,6 +181,7 @@ public class ServerEntity { diff --git a/patches/server/0034-Use-fast-item-merge-raytracing.patch b/patches/server/0035-Use-fast-item-merge-raytracing.patch similarity index 100% rename from patches/server/0034-Use-fast-item-merge-raytracing.patch rename to patches/server/0035-Use-fast-item-merge-raytracing.patch diff --git a/patches/server/0035-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/0035-Use-aging-cache-for-biome-temperatures.patch rename to patches/server/0036-Use-aging-cache-for-biome-temperatures.patch diff --git a/patches/server/0036-Inline-level-height.patch b/patches/server/0037-Inline-level-height.patch similarity index 100% rename from patches/server/0036-Inline-level-height.patch rename to patches/server/0037-Inline-level-height.patch diff --git a/patches/server/0037-Use-ThreadUnsafeRandom-for-mob-spawning.patch b/patches/server/0038-Use-ThreadUnsafeRandom-for-mob-spawning.patch similarity index 96% rename from patches/server/0037-Use-ThreadUnsafeRandom-for-mob-spawning.patch rename to patches/server/0038-Use-ThreadUnsafeRandom-for-mob-spawning.patch index 9ed7b64..cf9aeac 100644 --- a/patches/server/0037-Use-ThreadUnsafeRandom-for-mob-spawning.patch +++ b/patches/server/0038-Use-ThreadUnsafeRandom-for-mob-spawning.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/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -index eebc251467ddc141b2ae0408941740f6b01d11f2..e0faab041aa2cca41f56fc065d04ca572a36a329 100644 +index 599efa2ed24e0d4944324c86ca23c38d8b111277..135c62a90b1cf924812fa4c8c224057eed67a109 100644 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java @@ -415,13 +415,14 @@ public final class NaturalSpawner { diff --git a/patches/server/0038-Remove-streams-and-iterators-from-range-check.patch b/patches/server/0039-Remove-streams-and-iterators-from-range-check.patch similarity index 97% rename from patches/server/0038-Remove-streams-and-iterators-from-range-check.patch rename to patches/server/0039-Remove-streams-and-iterators-from-range-check.patch index 71009c5..f1f10b7 100644 --- a/patches/server/0038-Remove-streams-and-iterators-from-range-check.patch +++ b/patches/server/0039-Remove-streams-and-iterators-from-range-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/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 31963a0931bcd3465e46b9c875e89ac56aead62d..caa765c6264e14cc66973267f94074c7056fe122 100644 +index 67d778ef115fc1e09fc8fa9c21d17613a11ca17f..eb12a3c0aefb3d6a42f08439db1ca51e3db65241 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1549,8 +1549,30 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0039-Remove-streams-from-getting-nearby-players.patch b/patches/server/0040-Remove-streams-from-getting-nearby-players.patch similarity index 97% rename from patches/server/0039-Remove-streams-from-getting-nearby-players.patch rename to patches/server/0040-Remove-streams-from-getting-nearby-players.patch index 256fc46..7d3bc97 100644 --- a/patches/server/0039-Remove-streams-from-getting-nearby-players.patch +++ b/patches/server/0040-Remove-streams-from-getting-nearby-players.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/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 431bc32a61934f9bf4d268df1f70194c3e48ee93..93255c7388c1a2f281f508f8ca34571bf565accd 100644 +index be9ac3b5b1107f588f6c00e7768a883691a8adcb..32ec0620e9d8c900df5ce78c1ff5f306bff969d2 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -507,17 +507,37 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0040-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/0040-Block-goal-does-not-load-chunks.patch rename to patches/server/0041-Block-goal-does-not-load-chunks.patch diff --git a/patches/server/0041-Reduce-entity-allocations.patch b/patches/server/0042-Reduce-entity-allocations.patch similarity index 97% rename from patches/server/0041-Reduce-entity-allocations.patch rename to patches/server/0042-Reduce-entity-allocations.patch index 33839bc..eef5c6e 100644 --- a/patches/server/0041-Reduce-entity-allocations.patch +++ b/patches/server/0042-Reduce-entity-allocations.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/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 93255c7388c1a2f281f508f8ca34571bf565accd..c27af8fc81f09abbb99b2b9cd990477298b210ed 100644 +index 32ec0620e9d8c900df5ce78c1ff5f306bff969d2..14ce63f8fbac2214f1653a5388043de0420d7223 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -433,6 +433,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0042-Remove-lambda-from-ticking-guard.patch b/patches/server/0043-Remove-lambda-from-ticking-guard.patch similarity index 100% rename from patches/server/0042-Remove-lambda-from-ticking-guard.patch rename to patches/server/0043-Remove-lambda-from-ticking-guard.patch diff --git a/patches/server/0043-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/0043-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/0044-Make-book-writing-configurable.patch b/patches/server/0045-Make-book-writing-configurable.patch similarity index 98% rename from patches/server/0044-Make-book-writing-configurable.patch rename to patches/server/0045-Make-book-writing-configurable.patch index a0a1bdb..c06d60a 100644 --- a/patches/server/0044-Make-book-writing-configurable.patch +++ b/patches/server/0045-Make-book-writing-configurable.patch @@ -22,7 +22,7 @@ you to easily disable books, should you want to preemptively remove this functionality before additional exploits are found. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8b0441f672f1821e31860d3318c09c309b276135..9645952c84412adf5b98c2c189e6a9dc8612c8c8 100644 +index 1b66c30ad7b4db4a77aa4da66ce7ed6843bdb370..47c6c3b3d0ac90771b872a921dab06832c0c18c2 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -184,6 +184,8 @@ import net.minecraft.world.phys.Vec3; diff --git a/patches/server/0045-Optimize-entity-coordinate-key.patch b/patches/server/0046-Optimize-entity-coordinate-key.patch similarity index 90% rename from patches/server/0045-Optimize-entity-coordinate-key.patch rename to patches/server/0046-Optimize-entity-coordinate-key.patch index acffa5e..73a7aac 100644 --- a/patches/server/0045-Optimize-entity-coordinate-key.patch +++ b/patches/server/0046-Optimize-entity-coordinate-key.patch @@ -22,10 +22,10 @@ data is already available in the blockPosition struct, so we use that instead of re-doing the casting. diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java -index cb4379268b191d331c71be44642baac381ffaaf6..77aa75c9b1c31b47513a9d06b0930f9524a3d6d1 100644 +index 517ea24ed254eaa9c13439b8b83e8391ea5e10ff..7b3713c8c0840190292a96b7e8b9be620c83274d 100644 --- a/src/main/java/io/papermc/paper/util/MCUtil.java +++ b/src/main/java/io/papermc/paper/util/MCUtil.java -@@ -211,7 +211,7 @@ public final class MCUtil { +@@ -209,7 +209,7 @@ public final class MCUtil { } public static long getCoordinateKey(final Entity entity) { @@ -35,7 +35,7 @@ index cb4379268b191d331c71be44642baac381ffaaf6..77aa75c9b1c31b47513a9d06b0930f95 public static long getCoordinateKey(final ChunkPos pair) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 24e43afed47993d25df37a1f0e7d90d77205cb0d..c6d41c3650d24ebfbb57b75a1d76a12aa6a22faf 100644 +index 6754e0636e5b11f431717e9e77310ac00f8b33b4..1e43237008827538773d3299778d6778bee4049b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -306,7 +306,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0046-Reduce-in-wall-checks.patch b/patches/server/0047-Reduce-in-wall-checks.patch similarity index 100% rename from patches/server/0046-Reduce-in-wall-checks.patch rename to patches/server/0047-Reduce-in-wall-checks.patch diff --git a/patches/server/0047-Make-chat-order-verification-configurable.patch b/patches/server/0048-Make-chat-order-verification-configurable.patch similarity index 100% rename from patches/server/0047-Make-chat-order-verification-configurable.patch rename to patches/server/0048-Make-chat-order-verification-configurable.patch diff --git a/patches/server/0048-Dragon-respawn-end-crystal-proximity-check.patch b/patches/server/0049-Dragon-respawn-end-crystal-proximity-check.patch similarity index 100% rename from patches/server/0048-Dragon-respawn-end-crystal-proximity-check.patch rename to patches/server/0049-Dragon-respawn-end-crystal-proximity-check.patch diff --git a/patches/server/0049-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/0049-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/0050-Make-saving-fireworks-configurable.patch b/patches/server/0051-Make-saving-fireworks-configurable.patch similarity index 100% rename from patches/server/0050-Make-saving-fireworks-configurable.patch rename to patches/server/0051-Make-saving-fireworks-configurable.patch diff --git a/patches/server/0051-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/0051-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/0052-Reduce-hopper-item-checks.patch b/patches/server/0053-Reduce-hopper-item-checks.patch similarity index 100% rename from patches/server/0052-Reduce-hopper-item-checks.patch rename to patches/server/0053-Reduce-hopper-item-checks.patch diff --git a/patches/server/0053-Reduce-villager-item-re-pickup.patch b/patches/server/0054-Reduce-villager-item-re-pickup.patch similarity index 100% rename from patches/server/0053-Reduce-villager-item-re-pickup.patch rename to patches/server/0054-Reduce-villager-item-re-pickup.patch diff --git a/patches/server/0054-Variable-entity-wake-up-duration.patch b/patches/server/0055-Variable-entity-wake-up-duration.patch similarity index 100% rename from patches/server/0054-Variable-entity-wake-up-duration.patch rename to patches/server/0055-Variable-entity-wake-up-duration.patch diff --git a/patches/server/0055-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/0055-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/0056-Do-not-log-invalid-statistics.patch b/patches/server/0057-Do-not-log-invalid-statistics.patch similarity index 100% rename from patches/server/0056-Do-not-log-invalid-statistics.patch rename to patches/server/0057-Do-not-log-invalid-statistics.patch diff --git a/patches/server/0057-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/0057-Do-not-log-empty-message-warnings.patch rename to patches/server/0058-Do-not-log-empty-message-warnings.patch diff --git a/patches/server/0058-Do-not-log-ignored-advancements.patch b/patches/server/0059-Do-not-log-ignored-advancements.patch similarity index 100% rename from patches/server/0058-Do-not-log-ignored-advancements.patch rename to patches/server/0059-Do-not-log-ignored-advancements.patch diff --git a/patches/server/0059-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/0059-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/0060-Do-not-log-unrecognized-recipes.patch b/patches/server/0061-Do-not-log-unrecognized-recipes.patch similarity index 100% rename from patches/server/0060-Do-not-log-unrecognized-recipes.patch rename to patches/server/0061-Do-not-log-unrecognized-recipes.patch diff --git a/patches/server/0061-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/0061-Do-not-log-legacy-Material-initialization.patch rename to patches/server/0062-Do-not-log-legacy-Material-initialization.patch diff --git a/patches/server/0062-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/0062-Do-not-log-plugin-library-loads.patch rename to patches/server/0063-Do-not-log-plugin-library-loads.patch diff --git a/patches/server/0063-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/0063-Do-not-log-expired-message-warnings.patch rename to patches/server/0064-Do-not-log-expired-message-warnings.patch diff --git a/patches/server/0064-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/0064-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/0065-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/0065-Do-not-log-Not-Secure-marker.patch rename to patches/server/0066-Do-not-log-Not-Secure-marker.patch diff --git a/patches/server/0066-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/0066-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/0067-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/0067-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/0068-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/0068-Do-not-log-offline-mode-warning.patch rename to patches/server/0069-Do-not-log-offline-mode-warning.patch diff --git a/patches/server/0069-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/0069-Softly-log-invalid-pool-element-errors.patch rename to patches/server/0070-Softly-log-invalid-pool-element-errors.patch diff --git a/patches/server/0070-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/0070-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/0071-Make-sand-duping-fix-configurable.patch b/patches/server/0072-Make-sand-duping-fix-configurable.patch similarity index 100% rename from patches/server/0071-Make-sand-duping-fix-configurable.patch rename to patches/server/0072-Make-sand-duping-fix-configurable.patch diff --git a/patches/server/0072-Fix-MC-238526.patch b/patches/server/0073-Fix-MC-238526.patch similarity index 100% rename from patches/server/0072-Fix-MC-238526.patch rename to patches/server/0073-Fix-MC-238526.patch diff --git a/patches/server/0073-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0074-Fix-cow-rotation-when-shearing-mooshroom.patch similarity index 100% rename from patches/server/0073-Fix-cow-rotation-when-shearing-mooshroom.patch rename to patches/server/0074-Fix-cow-rotation-when-shearing-mooshroom.patch diff --git a/patches/server/0074-Fix-MC-121706.patch b/patches/server/0075-Fix-MC-121706.patch similarity index 100% rename from patches/server/0074-Fix-MC-121706.patch rename to patches/server/0075-Fix-MC-121706.patch diff --git a/patches/server/0075-Fix-MC-110386.patch b/patches/server/0076-Fix-MC-110386.patch similarity index 100% rename from patches/server/0075-Fix-MC-110386.patch rename to patches/server/0076-Fix-MC-110386.patch diff --git a/patches/server/0076-Fix-MC-31819.patch b/patches/server/0077-Fix-MC-31819.patch similarity index 100% rename from patches/server/0076-Fix-MC-31819.patch rename to patches/server/0077-Fix-MC-31819.patch diff --git a/patches/server/0077-Fix-MC-26304.patch b/patches/server/0078-Fix-MC-26304.patch similarity index 100% rename from patches/server/0077-Fix-MC-26304.patch rename to patches/server/0078-Fix-MC-26304.patch diff --git a/patches/server/0078-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0079-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 100% rename from patches/server/0078-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0079-End-gateway-should-check-if-entity-can-use-portal.patch diff --git a/patches/server/0079-Make-arrow-movement-resetting-despawn-counter-config.patch b/patches/server/0080-Make-arrow-movement-resetting-despawn-counter-config.patch similarity index 100% rename from patches/server/0079-Make-arrow-movement-resetting-despawn-counter-config.patch rename to patches/server/0080-Make-arrow-movement-resetting-despawn-counter-config.patch diff --git a/patches/server/0080-Make-logging-login-locations-configurable.patch b/patches/server/0081-Make-logging-login-locations-configurable.patch similarity index 100% rename from patches/server/0080-Make-logging-login-locations-configurable.patch rename to patches/server/0081-Make-logging-login-locations-configurable.patch diff --git a/patches/server/0081-Reduce-array-allocations.patch b/patches/server/0082-Reduce-array-allocations.patch similarity index 100% rename from patches/server/0081-Reduce-array-allocations.patch rename to patches/server/0082-Reduce-array-allocations.patch diff --git a/patches/server/0082-Optimize-sun-burn-tick.patch b/patches/server/0083-Optimize-sun-burn-tick.patch similarity index 98% rename from patches/server/0082-Optimize-sun-burn-tick.patch rename to patches/server/0083-Optimize-sun-burn-tick.patch index d8adcdd..45ff1eb 100644 --- a/patches/server/0082-Optimize-sun-burn-tick.patch +++ b/patches/server/0083-Optimize-sun-burn-tick.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/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c6d41c3650d24ebfbb57b75a1d76a12aa6a22faf..bd82f2374dc991dea21b83ae44d7f5708dc4e357 100644 +index 1e43237008827538773d3299778d6778bee4049b..ef85df48cfac8af3c15df0d686eea73c1346423c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -305,7 +305,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0083-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0084-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from patches/server/0083-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to patches/server/0084-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/patches/server/0084-Replace-AI-goal-set-with-optimized-collection.patch b/patches/server/0085-Replace-AI-goal-set-with-optimized-collection.patch similarity index 100% rename from patches/server/0084-Replace-AI-goal-set-with-optimized-collection.patch rename to patches/server/0085-Replace-AI-goal-set-with-optimized-collection.patch diff --git a/patches/server/0085-Replace-game-rules-map-with-optimized-collection.patch b/patches/server/0086-Replace-game-rules-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0085-Replace-game-rules-map-with-optimized-collection.patch rename to patches/server/0086-Replace-game-rules-map-with-optimized-collection.patch diff --git a/patches/server/0086-Replace-AI-attributes-with-optimized-collections.patch b/patches/server/0087-Replace-AI-attributes-with-optimized-collections.patch similarity index 100% rename from patches/server/0086-Replace-AI-attributes-with-optimized-collections.patch rename to patches/server/0087-Replace-AI-attributes-with-optimized-collections.patch diff --git a/patches/server/0087-Replace-class-map-with-optimized-collection.patch b/patches/server/0088-Replace-class-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0087-Replace-class-map-with-optimized-collection.patch rename to patches/server/0088-Replace-class-map-with-optimized-collection.patch diff --git a/patches/server/0088-Replace-throttle-tracker-map-with-optimized-collecti.patch b/patches/server/0089-Replace-throttle-tracker-map-with-optimized-collecti.patch similarity index 100% rename from patches/server/0088-Replace-throttle-tracker-map-with-optimized-collecti.patch rename to patches/server/0089-Replace-throttle-tracker-map-with-optimized-collecti.patch diff --git a/patches/server/0089-Replace-shape-full-block-cache-with-hashtable.patch b/patches/server/0090-Replace-shape-full-block-cache-with-hashtable.patch similarity index 100% rename from patches/server/0089-Replace-shape-full-block-cache-with-hashtable.patch rename to patches/server/0090-Replace-shape-full-block-cache-with-hashtable.patch diff --git a/patches/server/0090-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0091-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from patches/server/0090-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to patches/server/0091-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/patches/server/0091-Cache-BlockStatePairKey-hash.patch b/patches/server/0092-Cache-BlockStatePairKey-hash.patch similarity index 100% rename from patches/server/0091-Cache-BlockStatePairKey-hash.patch rename to patches/server/0092-Cache-BlockStatePairKey-hash.patch diff --git a/patches/server/0092-Cache-CubeVoxelShape-shape-array.patch b/patches/server/0093-Cache-CubeVoxelShape-shape-array.patch similarity index 100% rename from patches/server/0092-Cache-CubeVoxelShape-shape-array.patch rename to patches/server/0093-Cache-CubeVoxelShape-shape-array.patch diff --git a/patches/server/0093-Replace-division-by-multiplication-in-CubePointRange.patch b/patches/server/0094-Replace-division-by-multiplication-in-CubePointRange.patch similarity index 100% rename from patches/server/0093-Replace-division-by-multiplication-in-CubePointRange.patch rename to patches/server/0094-Replace-division-by-multiplication-in-CubePointRange.patch diff --git a/patches/server/0094-Replace-parts-by-size-in-CubePointRange.patch b/patches/server/0095-Replace-parts-by-size-in-CubePointRange.patch similarity index 100% rename from patches/server/0094-Replace-parts-by-size-in-CubePointRange.patch rename to patches/server/0095-Replace-parts-by-size-in-CubePointRange.patch diff --git a/patches/server/0095-Check-frozen-ticks-before-landing-block.patch b/patches/server/0096-Check-frozen-ticks-before-landing-block.patch similarity index 100% rename from patches/server/0095-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0096-Check-frozen-ticks-before-landing-block.patch diff --git a/patches/server/0096-Faster-chunk-serialization.patch b/patches/server/0097-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0096-Faster-chunk-serialization.patch rename to patches/server/0097-Faster-chunk-serialization.patch diff --git a/patches/server/0097-Update-boss-bar-within-tick.patch b/patches/server/0098-Update-boss-bar-within-tick.patch similarity index 100% rename from patches/server/0097-Update-boss-bar-within-tick.patch rename to patches/server/0098-Update-boss-bar-within-tick.patch diff --git a/patches/server/0098-Cache-ominous-banner-item.patch b/patches/server/0099-Cache-ominous-banner-item.patch similarity index 100% rename from patches/server/0098-Cache-ominous-banner-item.patch rename to patches/server/0099-Cache-ominous-banner-item.patch diff --git a/patches/server/0099-Optimize-world-generation-chunk-and-block-access.patch b/patches/server/0100-Optimize-world-generation-chunk-and-block-access.patch similarity index 100% rename from patches/server/0099-Optimize-world-generation-chunk-and-block-access.patch rename to patches/server/0100-Optimize-world-generation-chunk-and-block-access.patch diff --git a/patches/server/0100-Cache-world-generator-sea-level.patch b/patches/server/0101-Cache-world-generator-sea-level.patch similarity index 100% rename from patches/server/0100-Cache-world-generator-sea-level.patch rename to patches/server/0101-Cache-world-generator-sea-level.patch diff --git a/patches/server/0101-Skip-secondary-POI-sensor-if-absent.patch b/patches/server/0102-Skip-secondary-POI-sensor-if-absent.patch similarity index 100% rename from patches/server/0101-Skip-secondary-POI-sensor-if-absent.patch rename to patches/server/0102-Skip-secondary-POI-sensor-if-absent.patch diff --git a/patches/server/0102-Optimize-villager-data-storage.patch b/patches/server/0103-Optimize-villager-data-storage.patch similarity index 100% rename from patches/server/0102-Optimize-villager-data-storage.patch rename to patches/server/0103-Optimize-villager-data-storage.patch diff --git a/patches/server/0103-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0104-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0103-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0104-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0104-Store-mob-counts-in-an-array.patch b/patches/server/0105-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0104-Store-mob-counts-in-an-array.patch rename to patches/server/0105-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0105-Use-linked-map-for-entity-trackers.patch b/patches/server/0106-Use-linked-map-for-entity-trackers.patch similarity index 100% rename from patches/server/0105-Use-linked-map-for-entity-trackers.patch rename to patches/server/0106-Use-linked-map-for-entity-trackers.patch diff --git a/patches/server/0106-Optimize-noise-generation.patch b/patches/server/0107-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0106-Optimize-noise-generation.patch rename to patches/server/0107-Optimize-noise-generation.patch diff --git a/patches/server/0107-Optimize-sheep-offspring-color.patch b/patches/server/0108-Optimize-sheep-offspring-color.patch similarity index 100% rename from patches/server/0107-Optimize-sheep-offspring-color.patch rename to patches/server/0108-Optimize-sheep-offspring-color.patch diff --git a/patches/server/0108-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0109-Hide-flames-on-entities-with-fire-resistance.patch similarity index 96% rename from patches/server/0108-Hide-flames-on-entities-with-fire-resistance.patch rename to patches/server/0109-Hide-flames-on-entities-with-fire-resistance.patch index cd15bc8..b3a9fdd 100644 --- a/patches/server/0108-Hide-flames-on-entities-with-fire-resistance.patch +++ b/patches/server/0109-Hide-flames-on-entities-with-fire-resistance.patch @@ -13,7 +13,7 @@ As part of: Slice (https://github.com/Cryptite/Slice) Licensed under: MIT (https://opensource.org/licenses/MIT) diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 5690f551281a8d0cc3927cb4d860a403141b7239..4f654e5cc39ca3fccb0bff1c1f859a17e7d17229 100644 +index 38e24fbc55d36d1e5529e3ff0315b2408cdb99a9..0b22993d2f6bdc6a096626ae76dac2433293fa14 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -890,7 +890,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0109-Skip-cloning-advancement-criteria.patch b/patches/server/0110-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0109-Skip-cloning-advancement-criteria.patch rename to patches/server/0110-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0110-Reduce-block-destruction-packet-allocations.patch b/patches/server/0111-Reduce-block-destruction-packet-allocations.patch similarity index 100% rename from patches/server/0110-Reduce-block-destruction-packet-allocations.patch rename to patches/server/0111-Reduce-block-destruction-packet-allocations.patch diff --git a/patches/server/0111-Spread-out-sending-all-player-info.patch b/patches/server/0112-Spread-out-sending-all-player-info.patch similarity index 100% rename from patches/server/0111-Spread-out-sending-all-player-info.patch rename to patches/server/0112-Spread-out-sending-all-player-info.patch diff --git a/patches/server/0112-Optimize-player-list-for-sending-player-info.patch b/patches/server/0113-Optimize-player-list-for-sending-player-info.patch similarity index 100% rename from patches/server/0112-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0113-Optimize-player-list-for-sending-player-info.patch diff --git a/patches/server/0113-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0114-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0113-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0114-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0114-Send-multiple-keep-alive-packets.patch b/patches/server/0115-Send-multiple-keep-alive-packets.patch similarity index 100% rename from patches/server/0114-Send-multiple-keep-alive-packets.patch rename to patches/server/0115-Send-multiple-keep-alive-packets.patch diff --git a/patches/server/0115-Make-slow-login-timeout-configurable.patch b/patches/server/0116-Make-slow-login-timeout-configurable.patch similarity index 100% rename from patches/server/0115-Make-slow-login-timeout-configurable.patch rename to patches/server/0116-Make-slow-login-timeout-configurable.patch diff --git a/patches/server/0116-Make-max-interaction-distance-configurable.patch b/patches/server/0117-Make-max-interaction-distance-configurable.patch similarity index 100% rename from patches/server/0116-Make-max-interaction-distance-configurable.patch rename to patches/server/0117-Make-max-interaction-distance-configurable.patch diff --git a/patches/server/0117-Load-portal-destination-chunk-before-entity-teleport.patch b/patches/server/0118-Load-portal-destination-chunk-before-entity-teleport.patch similarity index 100% rename from patches/server/0117-Load-portal-destination-chunk-before-entity-teleport.patch rename to patches/server/0118-Load-portal-destination-chunk-before-entity-teleport.patch diff --git a/patches/server/0118-Don-t-load-chunks-to-spawn-phantoms.patch b/patches/server/0119-Don-t-load-chunks-to-spawn-phantoms.patch similarity index 100% rename from patches/server/0118-Don-t-load-chunks-to-spawn-phantoms.patch rename to patches/server/0119-Don-t-load-chunks-to-spawn-phantoms.patch diff --git a/patches/server/0119-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0120-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 100% rename from patches/server/0119-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0120-Don-t-load-chunks-to-activate-climbing-entities.patch diff --git a/patches/server/0120-Broadcast-crit-animations-as-the-entity-being-critte.patch b/patches/server/0121-Broadcast-crit-animations-as-the-entity-being-critte.patch similarity index 100% rename from patches/server/0120-Broadcast-crit-animations-as-the-entity-being-critte.patch rename to patches/server/0121-Broadcast-crit-animations-as-the-entity-being-critte.patch diff --git a/patches/server/0121-Ignore-null-legacy-structure-data.patch b/patches/server/0122-Ignore-null-legacy-structure-data.patch similarity index 100% rename from patches/server/0121-Ignore-null-legacy-structure-data.patch rename to patches/server/0122-Ignore-null-legacy-structure-data.patch diff --git a/patches/server/0122-Skip-unnecessary-mob-spawning-computations.patch b/patches/server/0123-Skip-unnecessary-mob-spawning-computations.patch similarity index 100% rename from patches/server/0122-Skip-unnecessary-mob-spawning-computations.patch rename to patches/server/0123-Skip-unnecessary-mob-spawning-computations.patch diff --git a/patches/server/0123-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0124-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 100% rename from patches/server/0123-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to patches/server/0124-Prevent-entities-random-strolling-into-non-ticking-c.patch diff --git a/patches/server/0124-Do-not-place-player-in-world-if-kicked-before-being-.patch b/patches/server/0125-Do-not-place-player-in-world-if-kicked-before-being-.patch similarity index 100% rename from patches/server/0124-Do-not-place-player-in-world-if-kicked-before-being-.patch rename to patches/server/0125-Do-not-place-player-in-world-if-kicked-before-being-.patch diff --git a/patches/server/0125-CraftBukkit-UUID-to-world-map.patch b/patches/server/0126-CraftBukkit-UUID-to-world-map.patch similarity index 100% rename from patches/server/0125-CraftBukkit-UUID-to-world-map.patch rename to patches/server/0126-CraftBukkit-UUID-to-world-map.patch diff --git a/patches/server/0126-Global-EULA-file.patch b/patches/server/0127-Global-EULA-file.patch similarity index 100% rename from patches/server/0126-Global-EULA-file.patch rename to patches/server/0127-Global-EULA-file.patch diff --git a/patches/server/0127-Specific-interval-TPS-API.patch b/patches/server/0128-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0127-Specific-interval-TPS-API.patch rename to patches/server/0128-Specific-interval-TPS-API.patch diff --git a/patches/server/0128-5-second-TPS-average.patch b/patches/server/0129-5-second-TPS-average.patch similarity index 100% rename from patches/server/0128-5-second-TPS-average.patch rename to patches/server/0129-5-second-TPS-average.patch diff --git a/patches/server/0129-Measure-last-tick-time.patch b/patches/server/0130-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0129-Measure-last-tick-time.patch rename to patches/server/0130-Measure-last-tick-time.patch diff --git a/patches/server/0130-Last-tick-time-API.patch b/patches/server/0131-Last-tick-time-API.patch similarity index 100% rename from patches/server/0130-Last-tick-time-API.patch rename to patches/server/0131-Last-tick-time-API.patch diff --git a/patches/server/0131-Show-last-tick-time-in-tps-command.patch b/patches/server/0132-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0131-Show-last-tick-time-in-tps-command.patch rename to patches/server/0132-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0132-Increase-time-statistics-in-intervals.patch b/patches/server/0133-Increase-time-statistics-in-intervals.patch similarity index 100% rename from patches/server/0132-Increase-time-statistics-in-intervals.patch rename to patches/server/0133-Increase-time-statistics-in-intervals.patch diff --git a/patches/server/0133-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0134-For-collision-check-has-physics-before-same-vehicle.patch similarity index 94% rename from patches/server/0133-For-collision-check-has-physics-before-same-vehicle.patch rename to patches/server/0134-For-collision-check-has-physics-before-same-vehicle.patch index 65df7d4..71819d0 100644 --- a/patches/server/0133-For-collision-check-has-physics-before-same-vehicle.patch +++ b/patches/server/0134-For-collision-check-has-physics-before-same-vehicle.patch @@ -16,7 +16,7 @@ As part of: Akarin (https://github.com/Akarin-project/Akarin) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 544c60e1792aa9c429efbdfa27e5fe0293857d15..b2b783cb41994c6ca462510d1e3944d57dd64a73 100644 +index ffb0e9a5c24d7c95f1cc1fe495ac4d76c6362eb8..1c690cf8cd867b6ab709ffb344c84167d63802db 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2122,8 +2122,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0134-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0135-Skip-negligible-planar-movement-multiplication.patch similarity index 94% rename from patches/server/0134-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0135-Skip-negligible-planar-movement-multiplication.patch index 53086c8..29f28d4 100644 --- a/patches/server/0134-Skip-negligible-planar-movement-multiplication.patch +++ b/patches/server/0135-Skip-negligible-planar-movement-multiplication.patch @@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index b2b783cb41994c6ca462510d1e3944d57dd64a73..fc12f540f4b2eb81636916c5150bc54ac12fc0c8 100644 +index 1c690cf8cd867b6ab709ffb344c84167d63802db..63be939e2efe2de7a8e2e50e711d59b5e0db0ce5 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1251,9 +1251,19 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0135-Optimize-matching-item-checks.patch b/patches/server/0136-Optimize-matching-item-checks.patch similarity index 100% rename from patches/server/0135-Optimize-matching-item-checks.patch rename to patches/server/0136-Optimize-matching-item-checks.patch diff --git a/patches/server/0136-Reduce-RandomSource-instances.patch b/patches/server/0137-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0136-Reduce-RandomSource-instances.patch rename to patches/server/0137-Reduce-RandomSource-instances.patch diff --git a/patches/server/0137-Server-thread-priority-environment-variable.patch b/patches/server/0138-Server-thread-priority-environment-variable.patch similarity index 100% rename from patches/server/0137-Server-thread-priority-environment-variable.patch rename to patches/server/0138-Server-thread-priority-environment-variable.patch diff --git a/patches/server/0138-Instantly-continue-on-world-upgrade-finish.patch b/patches/server/0139-Instantly-continue-on-world-upgrade-finish.patch similarity index 100% rename from patches/server/0138-Instantly-continue-on-world-upgrade-finish.patch rename to patches/server/0139-Instantly-continue-on-world-upgrade-finish.patch