diff --git a/patches/server/0017-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/removed/0017-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch similarity index 100% rename from patches/server/0017-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch rename to patches/removed/0017-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch diff --git a/patches/server/0045-Improve-container-checking-with-a-bitset.patch b/patches/removed/0045-Improve-container-checking-with-a-bitset.patch similarity index 100% rename from patches/server/0045-Improve-container-checking-with-a-bitset.patch rename to patches/removed/0045-Improve-container-checking-with-a-bitset.patch diff --git a/patches/server/0018-Add-SIMD-utilities.patch b/patches/server/0017-Add-SIMD-utilities.patch similarity index 98% rename from patches/server/0018-Add-SIMD-utilities.patch rename to patches/server/0017-Add-SIMD-utilities.patch index a678d9c..129dec7 100644 --- a/patches/server/0018-Add-SIMD-utilities.patch +++ b/patches/server/0017-Add-SIMD-utilities.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add SIMD utilities Patch from Pufferfish diff --git a/build.gradle.kts b/build.gradle.kts -index 164678d8c7f0a0a66adc957a86849fa927b7cb73..a151ca3a0803a5e653674e51e8d41a2f38b1f3df 100644 +index 99f31c4f5bf3064e483d5f387778c05742197e49..d73a4d547ad7768513773535d8cf15619c8079b0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -68,6 +68,12 @@ dependencies { diff --git a/patches/server/0019-Toggle-shared-random-for-players.patch b/patches/server/0018-Toggle-shared-random-for-players.patch similarity index 95% rename from patches/server/0019-Toggle-shared-random-for-players.patch rename to patches/server/0018-Toggle-shared-random-for-players.patch index c5f573f..ac26b7a 100644 --- a/patches/server/0019-Toggle-shared-random-for-players.patch +++ b/patches/server/0018-Toggle-shared-random-for-players.patch @@ -20,7 +20,7 @@ index 778de435ca3c13ccc2f2d86030e3529436a2d945..cac747a46cccf8b115917a72340e9b81 } } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ee15661227754149164893d6acf678d13b2e1b27..0c50b516d0ff1c2812a877b57148f01861f8027f 100644 +index 8b28f6fed78cbad95b7943efb05099edd9eeed57..300b4e97b7ad2408766762940bd7328a8e0649ac 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -566,6 +566,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0020-Kick-player-instead-of-crashing.patch b/patches/server/0019-Kick-player-instead-of-crashing.patch similarity index 100% rename from patches/server/0020-Kick-player-instead-of-crashing.patch rename to patches/server/0019-Kick-player-instead-of-crashing.patch diff --git a/patches/server/0021-Toggle-fix-TripWire-state-inconsistency.patch b/patches/server/0020-Toggle-fix-TripWire-state-inconsistency.patch similarity index 100% rename from patches/server/0021-Toggle-fix-TripWire-state-inconsistency.patch rename to patches/server/0020-Toggle-fix-TripWire-state-inconsistency.patch diff --git a/patches/server/0022-Entity-ticking-throttling-removal-to-prevent-lag.patch b/patches/server/0021-Entity-ticking-throttling-removal-to-prevent-lag.patch similarity index 98% rename from patches/server/0022-Entity-ticking-throttling-removal-to-prevent-lag.patch rename to patches/server/0021-Entity-ticking-throttling-removal-to-prevent-lag.patch index e37ab62..ac0d099 100644 --- a/patches/server/0022-Entity-ticking-throttling-removal-to-prevent-lag.patch +++ b/patches/server/0021-Entity-ticking-throttling-removal-to-prevent-lag.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity ticking throttling & removal to prevent lag. diff --git a/build.gradle.kts b/build.gradle.kts -index a151ca3a0803a5e653674e51e8d41a2f38b1f3df..30da22816eecfce179d365fa4de2b979438a302a 100644 +index d73a4d547ad7768513773535d8cf15619c8079b0..f29c4621b3ab04aec026c9062c979a659d620738 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,6 +23,7 @@ dependencies { @@ -353,7 +353,7 @@ index 1818c5ae88c331fb900470436f72049165c9e9f4..7115a481bc8805333aa36af334132f98 timings.tickEntities.stopTiming(); // Spigot gameprofilerfiller.pop(); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 1f194f5324ab5efc5ae11d248dd09f875624559c..641d27bdc711f5d1cdf39637f8ad032d46575216 100644 +index a090c16d53fcb220687a18aa37ca82663f4660c7..adad8d0cfec6c1b2be2c11ce847f64a92d39e1ec 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -179,6 +179,11 @@ public class Main { diff --git a/patches/server/0023-Toggle-safe-teleportation.patch b/patches/server/0022-Toggle-safe-teleportation.patch similarity index 100% rename from patches/server/0023-Toggle-safe-teleportation.patch rename to patches/server/0022-Toggle-safe-teleportation.patch diff --git a/patches/server/0024-Toggle-sand-duplication.patch b/patches/server/0023-Toggle-sand-duplication.patch similarity index 100% rename from patches/server/0024-Toggle-sand-duplication.patch rename to patches/server/0023-Toggle-sand-duplication.patch diff --git a/patches/server/0025-Vanilla-end-portal-teleportation.patch b/patches/server/0024-Vanilla-end-portal-teleportation.patch similarity index 100% rename from patches/server/0025-Vanilla-end-portal-teleportation.patch rename to patches/server/0024-Vanilla-end-portal-teleportation.patch diff --git a/patches/server/0026-Swap-distanceToSqr-and-target-test.patch b/patches/server/0025-Swap-distanceToSqr-and-target-test.patch similarity index 100% rename from patches/server/0026-Swap-distanceToSqr-and-target-test.patch rename to patches/server/0025-Swap-distanceToSqr-and-target-test.patch diff --git a/patches/server/0027-Use-Math.floor-instead-of-fastfloor.patch b/patches/server/0026-Use-Math.floor-instead-of-fastfloor.patch similarity index 100% rename from patches/server/0027-Use-Math.floor-instead-of-fastfloor.patch rename to patches/server/0026-Use-Math.floor-instead-of-fastfloor.patch diff --git a/patches/server/0028-Allow-user-to-enable-moving-into-unloaded-chunks.patch b/patches/server/0027-Allow-user-to-enable-moving-into-unloaded-chunks.patch similarity index 100% rename from patches/server/0028-Allow-user-to-enable-moving-into-unloaded-chunks.patch rename to patches/server/0027-Allow-user-to-enable-moving-into-unloaded-chunks.patch diff --git a/patches/server/0029-Don-t-pathfind-outside-region.patch b/patches/server/0028-Don-t-pathfind-outside-region.patch similarity index 100% rename from patches/server/0029-Don-t-pathfind-outside-region.patch rename to patches/server/0028-Don-t-pathfind-outside-region.patch diff --git a/patches/server/0030-Don-t-spam-recipe-changes-on-update.patch b/patches/server/0029-Don-t-spam-recipe-changes-on-update.patch similarity index 100% rename from patches/server/0030-Don-t-spam-recipe-changes-on-update.patch rename to patches/server/0029-Don-t-spam-recipe-changes-on-update.patch diff --git a/patches/server/0031-Option-to-disable-vanish-api.patch b/patches/server/0030-Option-to-disable-vanish-api.patch similarity index 95% rename from patches/server/0031-Option-to-disable-vanish-api.patch rename to patches/server/0030-Option-to-disable-vanish-api.patch index 01c3261..7fbe1da 100644 --- a/patches/server/0031-Option-to-disable-vanish-api.patch +++ b/patches/server/0030-Option-to-disable-vanish-api.patch @@ -20,7 +20,7 @@ index cac747a46cccf8b115917a72340e9b81e7a437c9..a3c15f1009dad095b9411242e2d0347a public static String serverModName = "Kaiiju"; diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index f50507ab85282d261985ce9b186581f5a7a50f79..4fb7ee801173c3f4621d7f09fcefe7c24da5f001 100644 +index 59d77d6b431cf30fc91dfe4f9eef00b77f3c0a29..eac8dceca98f0f5a096373f7d84c1905360f32d5 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1350,7 +1350,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0032-Option-to-disable-player-stats.patch b/patches/server/0031-Option-to-disable-player-stats.patch similarity index 94% rename from patches/server/0032-Option-to-disable-player-stats.patch rename to patches/server/0031-Option-to-disable-player-stats.patch index 3e76d64..049c13a 100644 --- a/patches/server/0032-Option-to-disable-player-stats.patch +++ b/patches/server/0031-Option-to-disable-player-stats.patch @@ -21,7 +21,7 @@ index a3c15f1009dad095b9411242e2d0347a6141984b..8c872b2ad341f0105275209201fda037 public static String serverModName = "Kaiiju"; diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c0ad878cd29e2f72b7899d9539031b15ccbf6193..53f5bf8e6660f25290d4e64aca9c2911921b9fed 100644 +index cf18ea69915fd195e1ea4b8840d528a643ff8b8a..76a48f708a35df5631f0010498afda858a9293ca 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2138,6 +2138,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0033-Option-to-disable-achievements.patch b/patches/server/0032-Option-to-disable-achievements.patch similarity index 98% rename from patches/server/0033-Option-to-disable-achievements.patch rename to patches/server/0032-Option-to-disable-achievements.patch index 4cab3a2..c8cb28a 100644 --- a/patches/server/0033-Option-to-disable-achievements.patch +++ b/patches/server/0032-Option-to-disable-achievements.patch @@ -24,7 +24,7 @@ index 9f0095f2196133a8bcffd5306aa9ac0b99b2f8d7..31d66bb2fcf4bb7262df2d8006e307fe public boolean fixVoidTrading = true; diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 53f5bf8e6660f25290d4e64aca9c2911921b9fed..3c1871a879a14d38e56b0c31a73b2f42597d0816 100644 +index 76a48f708a35df5631f0010498afda858a9293ca..a14b1ff86c46a77ceb55fbcb5eba822f50705ae3 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -792,7 +792,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0034-Option-to-disable-arm-swing-event.patch b/patches/server/0033-Option-to-disable-arm-swing-event.patch similarity index 100% rename from patches/server/0034-Option-to-disable-arm-swing-event.patch rename to patches/server/0033-Option-to-disable-arm-swing-event.patch diff --git a/patches/server/0035-Option-to-disable-creatures-spawn-events.patch b/patches/server/0034-Option-to-disable-creatures-spawn-events.patch similarity index 100% rename from patches/server/0035-Option-to-disable-creatures-spawn-events.patch rename to patches/server/0034-Option-to-disable-creatures-spawn-events.patch diff --git a/patches/server/0036-Option-to-disable-dolphin-swim-to-treasure.patch b/patches/server/0035-Option-to-disable-dolphin-swim-to-treasure.patch similarity index 96% rename from patches/server/0036-Option-to-disable-dolphin-swim-to-treasure.patch rename to patches/server/0035-Option-to-disable-dolphin-swim-to-treasure.patch index a988522..0347a25 100644 --- a/patches/server/0036-Option-to-disable-dolphin-swim-to-treasure.patch +++ b/patches/server/0035-Option-to-disable-dolphin-swim-to-treasure.patch @@ -25,7 +25,7 @@ index c9830912019079369268bfbf2c95de18ad598f52..e2fb7d7a7b3126d386b46442c115085d public boolean fixVoidTrading = true; diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java -index 4ec6dc8ddcb940091956fdf014f43832db287d8d..770c3c26702d4136df6b8f891f4949f364b62a1b 100644 +index 8448c5d778998390cf2b683f36e4e18ca7ffdc34..8438ae5194bba7cad22af5e350c5a288529cbcdb 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java +++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java @@ -164,7 +164,7 @@ public class Dolphin extends WaterAnimal { diff --git a/patches/server/0037-Unsupported-configuration.patch b/patches/server/0036-Unsupported-configuration.patch similarity index 100% rename from patches/server/0037-Unsupported-configuration.patch rename to patches/server/0036-Unsupported-configuration.patch diff --git a/patches/server/0038-Option-to-disable-ensure-tick-thread-checks.patch b/patches/server/0037-Option-to-disable-ensure-tick-thread-checks.patch similarity index 100% rename from patches/server/0038-Option-to-disable-ensure-tick-thread-checks.patch rename to patches/server/0037-Option-to-disable-ensure-tick-thread-checks.patch diff --git a/patches/server/0039-Don-t-kick-player-on-bad-packet.patch b/patches/server/0038-Don-t-kick-player-on-bad-packet.patch similarity index 100% rename from patches/server/0039-Don-t-kick-player-on-bad-packet.patch rename to patches/server/0038-Don-t-kick-player-on-bad-packet.patch diff --git a/patches/server/0040-Skip-event-if-no-listeners.patch b/patches/server/0039-Skip-event-if-no-listeners.patch similarity index 100% rename from patches/server/0040-Skip-event-if-no-listeners.patch rename to patches/server/0039-Skip-event-if-no-listeners.patch diff --git a/patches/server/0041-Teleport-async-if-we-cannot-move-entity-off-main.patch b/patches/server/0040-Teleport-async-if-we-cannot-move-entity-off-main.patch similarity index 100% rename from patches/server/0041-Teleport-async-if-we-cannot-move-entity-off-main.patch rename to patches/server/0040-Teleport-async-if-we-cannot-move-entity-off-main.patch diff --git a/patches/server/0042-Add-back-worldborder-command.patch b/patches/server/0041-Add-back-worldborder-command.patch similarity index 100% rename from patches/server/0042-Add-back-worldborder-command.patch rename to patches/server/0041-Add-back-worldborder-command.patch diff --git a/patches/server/0043-Add-back-data-command.patch b/patches/server/0042-Add-back-data-command.patch similarity index 100% rename from patches/server/0043-Add-back-data-command.patch rename to patches/server/0042-Add-back-data-command.patch diff --git a/patches/server/0044-Async-path-processing.patch b/patches/server/0043-Async-path-processing.patch similarity index 100% rename from patches/server/0044-Async-path-processing.patch rename to patches/server/0043-Async-path-processing.patch diff --git a/patches/server/0046-Global-event-synchronization.patch b/patches/server/0044-Global-event-synchronization.patch similarity index 100% rename from patches/server/0046-Global-event-synchronization.patch rename to patches/server/0044-Global-event-synchronization.patch