aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches
diff options
context:
space:
mode:
authorBjarne Koll <[email protected]>2024-06-14 12:05:15 +0200
committerBjarne Koll <[email protected]>2024-06-14 12:05:15 +0200
commit6a34750160dd86201db605210eb638eb33d897a1 (patch)
treebef983fa81908bd9b60b01cf508d5fd5f0db3593 /patches
parent6d4e2357846217992d66014d50af17d826b10089 (diff)
downloadPaper-6a34750160dd86201db605210eb638eb33d897a1.tar.gz
Paper-6a34750160dd86201db605210eb638eb33d897a1.zip
Move unapplied patches to the back
Diffstat (limited to 'patches')
-rw-r--r--patches/unapplied/server/0989-Rewrite-dataconverter-system.patch (renamed from patches/unapplied/server/0971-Rewrite-dataconverter-system.patch)0
-rw-r--r--patches/unapplied/server/0990-Suspicious-Effect-Entry-API.patch (renamed from patches/unapplied/server/0972-Suspicious-Effect-Entry-API.patch)0
-rw-r--r--patches/unapplied/server/0991-check-if-itemstack-is-stackable-first.patch (renamed from patches/unapplied/server/0973-check-if-itemstack-is-stackable-first.patch)0
-rw-r--r--patches/unapplied/server/0992-disable-forced-empty-world-ticks.patch (renamed from patches/unapplied/server/0974-disable-forced-empty-world-ticks.patch)0
-rw-r--r--patches/unapplied/server/0993-Starlight.patch (renamed from patches/unapplied/server/0975-Starlight.patch)0
-rw-r--r--patches/unapplied/server/0994-Rewrite-chunk-system.patch (renamed from patches/unapplied/server/0976-Rewrite-chunk-system.patch)0
-rw-r--r--patches/unapplied/server/0995-incremental-chunk-and-player-saving.patch (renamed from patches/unapplied/server/0977-incremental-chunk-and-player-saving.patch)0
-rw-r--r--patches/unapplied/server/0996-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch (renamed from patches/unapplied/server/0978-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch)0
-rw-r--r--patches/unapplied/server/0997-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch (renamed from patches/unapplied/server/0979-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch)0
-rw-r--r--patches/unapplied/server/0998-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch (renamed from patches/unapplied/server/0980-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch)0
-rw-r--r--patches/unapplied/server/0999-Optimize-Network-Manager-and-add-advanced-packet-sup.patch (renamed from patches/unapplied/server/0981-Optimize-Network-Manager-and-add-advanced-packet-sup.patch)0
-rw-r--r--patches/unapplied/server/1000-Allow-Saving-of-Oversized-Chunks.patch (renamed from patches/unapplied/server/0982-Allow-Saving-of-Oversized-Chunks.patch)0
-rw-r--r--patches/unapplied/server/1001-Fix-World-isChunkGenerated-calls.patch (renamed from patches/unapplied/server/0983-Fix-World-isChunkGenerated-calls.patch)0
-rw-r--r--patches/unapplied/server/1002-Flat-bedrock-generator-settings.patch (renamed from patches/unapplied/server/0984-Flat-bedrock-generator-settings.patch)0
-rw-r--r--patches/unapplied/server/1003-Entity-Activation-Range-2.0.patch (renamed from patches/unapplied/server/0985-Entity-Activation-Range-2.0.patch)0
-rw-r--r--patches/unapplied/server/1004-Optional-per-player-mob-spawns.patch (renamed from patches/unapplied/server/0986-Optional-per-player-mob-spawns.patch)0
-rw-r--r--patches/unapplied/server/1005-Anti-Xray.patch (renamed from patches/unapplied/server/0987-Anti-Xray.patch)0
-rw-r--r--patches/unapplied/server/1006-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch (renamed from patches/unapplied/server/0988-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch)0
-rw-r--r--patches/unapplied/server/1007-Optimize-Collision-to-not-load-chunks.patch (renamed from patches/unapplied/server/0989-Optimize-Collision-to-not-load-chunks.patch)0
-rw-r--r--patches/unapplied/server/1008-Optimize-GoalSelector-Goal.Flag-Set-operations.patch (renamed from patches/unapplied/server/0990-Optimize-GoalSelector-Goal.Flag-Set-operations.patch)0
-rw-r--r--patches/unapplied/server/1009-Entity-load-save-limit-per-chunk.patch (renamed from patches/unapplied/server/0991-Entity-load-save-limit-per-chunk.patch)0
-rw-r--r--patches/unapplied/server/1010-Improved-Watchdog-Support.patch (renamed from patches/unapplied/server/0992-Improved-Watchdog-Support.patch)0
-rw-r--r--patches/unapplied/server/1011-Optimize-Voxel-Shape-Merging.patch (renamed from patches/unapplied/server/0993-Optimize-Voxel-Shape-Merging.patch)0
-rw-r--r--patches/unapplied/server/1012-Use-distance-map-to-optimise-entity-tracker.patch (renamed from patches/unapplied/server/0995-Use-distance-map-to-optimise-entity-tracker.patch)0
-rw-r--r--patches/unapplied/server/1013-Optimize-Bit-Operations-by-inlining.patch (renamed from patches/unapplied/server/0996-Optimize-Bit-Operations-by-inlining.patch)0
-rw-r--r--patches/unapplied/server/1014-Remove-streams-from-hot-code.patch (renamed from patches/unapplied/server/0997-Remove-streams-from-hot-code.patch)0
-rw-r--r--patches/unapplied/server/1015-Eigencraft-redstone-implementation.patch (renamed from patches/unapplied/server/0998-Eigencraft-redstone-implementation.patch)0
-rw-r--r--patches/unapplied/server/1016-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch (renamed from patches/unapplied/server/0999-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch)0
-rw-r--r--patches/unapplied/server/1017-Improve-boat-collision-performance.patch (renamed from patches/unapplied/server/1000-Improve-boat-collision-performance.patch)0
-rw-r--r--patches/unapplied/server/1018-Optimise-general-POI-access.patch (renamed from patches/unapplied/server/1001-Optimise-general-POI-access.patch)0
-rw-r--r--patches/unapplied/server/1019-Custom-table-implementation-for-blockstate-state-loo.patch (renamed from patches/unapplied/server/1002-Custom-table-implementation-for-blockstate-state-loo.patch)0
-rw-r--r--patches/unapplied/server/1020-Execute-chunk-tasks-mid-tick.patch (renamed from patches/unapplied/server/1003-Execute-chunk-tasks-mid-tick.patch)0
-rw-r--r--patches/unapplied/server/1021-Optimise-random-block-ticking.patch (renamed from patches/unapplied/server/1004-Optimise-random-block-ticking.patch)0
-rw-r--r--patches/unapplied/server/1022-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch (renamed from patches/unapplied/server/1005-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch)0
-rw-r--r--patches/unapplied/server/1023-Use-Velocity-compression-and-cipher-natives.patch (renamed from patches/unapplied/server/1006-Use-Velocity-compression-and-cipher-natives.patch)0
-rw-r--r--patches/unapplied/server/1024-Detail-more-information-in-watchdog-dumps.patch (renamed from patches/unapplied/server/1007-Detail-more-information-in-watchdog-dumps.patch)0
-rw-r--r--patches/unapplied/server/1025-Collision-optimisations.patch (renamed from patches/unapplied/server/1008-Collision-optimisations.patch)0
-rw-r--r--patches/unapplied/server/1026-Optimise-collision-checking-in-player-move-packet-ha.patch (renamed from patches/unapplied/server/1009-Optimise-collision-checking-in-player-move-packet-ha.patch)0
-rw-r--r--patches/unapplied/server/1027-Fix-entity-type-tags-suggestions-in-selectors.patch (renamed from patches/unapplied/server/1011-Fix-entity-type-tags-suggestions-in-selectors.patch)0
-rw-r--r--patches/unapplied/server/1028-Add-Alternate-Current-redstone-implementation.patch (renamed from patches/unapplied/server/1012-Add-Alternate-Current-redstone-implementation.patch)0
-rw-r--r--patches/unapplied/server/1029-optimize-dirt-and-snow-spreading.patch (renamed from patches/unapplied/server/1013-optimize-dirt-and-snow-spreading.patch)0
-rw-r--r--patches/unapplied/server/1030-Properly-resend-entities.patch (renamed from patches/unapplied/server/1014-Properly-resend-entities.patch)0
-rw-r--r--patches/unapplied/server/1031-Optimize-Hoppers.patch (renamed from patches/unapplied/server/1015-Optimize-Hoppers.patch)0
-rw-r--r--patches/unapplied/server/1032-Improve-performance-of-mass-crafts.patch (renamed from patches/unapplied/server/1016-Improve-performance-of-mass-crafts.patch)0
-rw-r--r--patches/unapplied/server/1033-Actually-optimise-explosions.patch (renamed from patches/unapplied/server/1017-Actually-optimise-explosions.patch)0
-rw-r--r--patches/unapplied/server/1034-Optimise-chunk-tick-iteration.patch (renamed from patches/unapplied/server/1018-Optimise-chunk-tick-iteration.patch)0
-rw-r--r--patches/unapplied/server/1035-Lag-compensation-ticks.patch (renamed from patches/unapplied/server/1019-Lag-compensation-ticks.patch)0
-rw-r--r--patches/unapplied/server/1036-Optimise-nearby-player-retrieval.patch (renamed from patches/unapplied/server/1020-Optimise-nearby-player-retrieval.patch)0
-rw-r--r--patches/unapplied/server/1037-Distance-manager-tick-timings.patch (renamed from patches/unapplied/server/1021-Distance-manager-tick-timings.patch)0
-rw-r--r--patches/unapplied/server/1038-Handle-Oversized-block-entities-in-chunks.patch (renamed from patches/unapplied/server/1022-Handle-Oversized-block-entities-in-chunks.patch)0
-rw-r--r--patches/unapplied/server/1039-Send-full-pos-packets-for-hard-colliding-entities.patch (renamed from patches/unapplied/server/1023-Send-full-pos-packets-for-hard-colliding-entities.patch)0
-rw-r--r--patches/unapplied/server/1040-API-for-checking-sent-chunks.patch (renamed from patches/unapplied/server/1024-API-for-checking-sent-chunks.patch)0
-rw-r--r--patches/unapplied/server/1041-Write-SavedData-IO-async.patch (renamed from patches/unapplied/server/1029-Write-SavedData-IO-async.patch)0
53 files changed, 0 insertions, 0 deletions
diff --git a/patches/unapplied/server/0971-Rewrite-dataconverter-system.patch b/patches/unapplied/server/0989-Rewrite-dataconverter-system.patch
index 993066ea40..993066ea40 100644
--- a/patches/unapplied/server/0971-Rewrite-dataconverter-system.patch
+++ b/patches/unapplied/server/0989-Rewrite-dataconverter-system.patch
diff --git a/patches/unapplied/server/0972-Suspicious-Effect-Entry-API.patch b/patches/unapplied/server/0990-Suspicious-Effect-Entry-API.patch
index 2ff782764f..2ff782764f 100644
--- a/patches/unapplied/server/0972-Suspicious-Effect-Entry-API.patch
+++ b/patches/unapplied/server/0990-Suspicious-Effect-Entry-API.patch
diff --git a/patches/unapplied/server/0973-check-if-itemstack-is-stackable-first.patch b/patches/unapplied/server/0991-check-if-itemstack-is-stackable-first.patch
index 6143642997..6143642997 100644
--- a/patches/unapplied/server/0973-check-if-itemstack-is-stackable-first.patch
+++ b/patches/unapplied/server/0991-check-if-itemstack-is-stackable-first.patch
diff --git a/patches/unapplied/server/0974-disable-forced-empty-world-ticks.patch b/patches/unapplied/server/0992-disable-forced-empty-world-ticks.patch
index c6a2989ea0..c6a2989ea0 100644
--- a/patches/unapplied/server/0974-disable-forced-empty-world-ticks.patch
+++ b/patches/unapplied/server/0992-disable-forced-empty-world-ticks.patch
diff --git a/patches/unapplied/server/0975-Starlight.patch b/patches/unapplied/server/0993-Starlight.patch
index bc604e348c..bc604e348c 100644
--- a/patches/unapplied/server/0975-Starlight.patch
+++ b/patches/unapplied/server/0993-Starlight.patch
diff --git a/patches/unapplied/server/0976-Rewrite-chunk-system.patch b/patches/unapplied/server/0994-Rewrite-chunk-system.patch
index 4df84d014c..4df84d014c 100644
--- a/patches/unapplied/server/0976-Rewrite-chunk-system.patch
+++ b/patches/unapplied/server/0994-Rewrite-chunk-system.patch
diff --git a/patches/unapplied/server/0977-incremental-chunk-and-player-saving.patch b/patches/unapplied/server/0995-incremental-chunk-and-player-saving.patch
index 6336814f6d..6336814f6d 100644
--- a/patches/unapplied/server/0977-incremental-chunk-and-player-saving.patch
+++ b/patches/unapplied/server/0995-incremental-chunk-and-player-saving.patch
diff --git a/patches/unapplied/server/0978-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/unapplied/server/0996-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index 474f3d6165..474f3d6165 100644
--- a/patches/unapplied/server/0978-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/unapplied/server/0996-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/unapplied/server/0979-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/unapplied/server/0997-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index ff16ec2e38..ff16ec2e38 100644
--- a/patches/unapplied/server/0979-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/unapplied/server/0997-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/unapplied/server/0980-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/unapplied/server/0998-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
index 0eb75c8acd..0eb75c8acd 100644
--- a/patches/unapplied/server/0980-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/unapplied/server/0998-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
diff --git a/patches/unapplied/server/0981-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/unapplied/server/0999-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index 84396ba635..84396ba635 100644
--- a/patches/unapplied/server/0981-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/unapplied/server/0999-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/unapplied/server/0982-Allow-Saving-of-Oversized-Chunks.patch b/patches/unapplied/server/1000-Allow-Saving-of-Oversized-Chunks.patch
index c190834bbb..c190834bbb 100644
--- a/patches/unapplied/server/0982-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/unapplied/server/1000-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/unapplied/server/0983-Fix-World-isChunkGenerated-calls.patch b/patches/unapplied/server/1001-Fix-World-isChunkGenerated-calls.patch
index 37c3afba66..37c3afba66 100644
--- a/patches/unapplied/server/0983-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/unapplied/server/1001-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/unapplied/server/0984-Flat-bedrock-generator-settings.patch b/patches/unapplied/server/1002-Flat-bedrock-generator-settings.patch
index b973a4d233..b973a4d233 100644
--- a/patches/unapplied/server/0984-Flat-bedrock-generator-settings.patch
+++ b/patches/unapplied/server/1002-Flat-bedrock-generator-settings.patch
diff --git a/patches/unapplied/server/0985-Entity-Activation-Range-2.0.patch b/patches/unapplied/server/1003-Entity-Activation-Range-2.0.patch
index 9502ae49bc..9502ae49bc 100644
--- a/patches/unapplied/server/0985-Entity-Activation-Range-2.0.patch
+++ b/patches/unapplied/server/1003-Entity-Activation-Range-2.0.patch
diff --git a/patches/unapplied/server/0986-Optional-per-player-mob-spawns.patch b/patches/unapplied/server/1004-Optional-per-player-mob-spawns.patch
index 2be04ece83..2be04ece83 100644
--- a/patches/unapplied/server/0986-Optional-per-player-mob-spawns.patch
+++ b/patches/unapplied/server/1004-Optional-per-player-mob-spawns.patch
diff --git a/patches/unapplied/server/0987-Anti-Xray.patch b/patches/unapplied/server/1005-Anti-Xray.patch
index 813b220c68..813b220c68 100644
--- a/patches/unapplied/server/0987-Anti-Xray.patch
+++ b/patches/unapplied/server/1005-Anti-Xray.patch
diff --git a/patches/unapplied/server/0988-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/unapplied/server/1006-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 7100cae640..7100cae640 100644
--- a/patches/unapplied/server/0988-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/unapplied/server/1006-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/unapplied/server/0989-Optimize-Collision-to-not-load-chunks.patch b/patches/unapplied/server/1007-Optimize-Collision-to-not-load-chunks.patch
index f089edd842..f089edd842 100644
--- a/patches/unapplied/server/0989-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/unapplied/server/1007-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/unapplied/server/0990-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/unapplied/server/1008-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index 1f46712639..1f46712639 100644
--- a/patches/unapplied/server/0990-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/unapplied/server/1008-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/unapplied/server/0991-Entity-load-save-limit-per-chunk.patch b/patches/unapplied/server/1009-Entity-load-save-limit-per-chunk.patch
index 1dbf729bda..1dbf729bda 100644
--- a/patches/unapplied/server/0991-Entity-load-save-limit-per-chunk.patch
+++ b/patches/unapplied/server/1009-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/unapplied/server/0992-Improved-Watchdog-Support.patch b/patches/unapplied/server/1010-Improved-Watchdog-Support.patch
index 88ad35da42..88ad35da42 100644
--- a/patches/unapplied/server/0992-Improved-Watchdog-Support.patch
+++ b/patches/unapplied/server/1010-Improved-Watchdog-Support.patch
diff --git a/patches/unapplied/server/0993-Optimize-Voxel-Shape-Merging.patch b/patches/unapplied/server/1011-Optimize-Voxel-Shape-Merging.patch
index 4ec779560c..4ec779560c 100644
--- a/patches/unapplied/server/0993-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/unapplied/server/1011-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/unapplied/server/0995-Use-distance-map-to-optimise-entity-tracker.patch b/patches/unapplied/server/1012-Use-distance-map-to-optimise-entity-tracker.patch
index adb2952c99..adb2952c99 100644
--- a/patches/unapplied/server/0995-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/unapplied/server/1012-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/unapplied/server/0996-Optimize-Bit-Operations-by-inlining.patch b/patches/unapplied/server/1013-Optimize-Bit-Operations-by-inlining.patch
index a1f24dd8dc..a1f24dd8dc 100644
--- a/patches/unapplied/server/0996-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/unapplied/server/1013-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/unapplied/server/0997-Remove-streams-from-hot-code.patch b/patches/unapplied/server/1014-Remove-streams-from-hot-code.patch
index 4c6d94f7bf..4c6d94f7bf 100644
--- a/patches/unapplied/server/0997-Remove-streams-from-hot-code.patch
+++ b/patches/unapplied/server/1014-Remove-streams-from-hot-code.patch
diff --git a/patches/unapplied/server/0998-Eigencraft-redstone-implementation.patch b/patches/unapplied/server/1015-Eigencraft-redstone-implementation.patch
index b3e3db6504..b3e3db6504 100644
--- a/patches/unapplied/server/0998-Eigencraft-redstone-implementation.patch
+++ b/patches/unapplied/server/1015-Eigencraft-redstone-implementation.patch
diff --git a/patches/unapplied/server/0999-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/unapplied/server/1016-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index 6fc4445bbf..6fc4445bbf 100644
--- a/patches/unapplied/server/0999-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/unapplied/server/1016-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/unapplied/server/1000-Improve-boat-collision-performance.patch b/patches/unapplied/server/1017-Improve-boat-collision-performance.patch
index ee5adde385..ee5adde385 100644
--- a/patches/unapplied/server/1000-Improve-boat-collision-performance.patch
+++ b/patches/unapplied/server/1017-Improve-boat-collision-performance.patch
diff --git a/patches/unapplied/server/1001-Optimise-general-POI-access.patch b/patches/unapplied/server/1018-Optimise-general-POI-access.patch
index 118734c246..118734c246 100644
--- a/patches/unapplied/server/1001-Optimise-general-POI-access.patch
+++ b/patches/unapplied/server/1018-Optimise-general-POI-access.patch
diff --git a/patches/unapplied/server/1002-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/unapplied/server/1019-Custom-table-implementation-for-blockstate-state-loo.patch
index 96d90abea3..96d90abea3 100644
--- a/patches/unapplied/server/1002-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/unapplied/server/1019-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/unapplied/server/1003-Execute-chunk-tasks-mid-tick.patch b/patches/unapplied/server/1020-Execute-chunk-tasks-mid-tick.patch
index aecd8e5402..aecd8e5402 100644
--- a/patches/unapplied/server/1003-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/unapplied/server/1020-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/unapplied/server/1004-Optimise-random-block-ticking.patch b/patches/unapplied/server/1021-Optimise-random-block-ticking.patch
index 36af1b75bf..36af1b75bf 100644
--- a/patches/unapplied/server/1004-Optimise-random-block-ticking.patch
+++ b/patches/unapplied/server/1021-Optimise-random-block-ticking.patch
diff --git a/patches/unapplied/server/1005-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/unapplied/server/1022-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index aac5515348..aac5515348 100644
--- a/patches/unapplied/server/1005-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/unapplied/server/1022-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/unapplied/server/1006-Use-Velocity-compression-and-cipher-natives.patch b/patches/unapplied/server/1023-Use-Velocity-compression-and-cipher-natives.patch
index c83372d4cd..c83372d4cd 100644
--- a/patches/unapplied/server/1006-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/unapplied/server/1023-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/unapplied/server/1007-Detail-more-information-in-watchdog-dumps.patch b/patches/unapplied/server/1024-Detail-more-information-in-watchdog-dumps.patch
index 458c8983d7..458c8983d7 100644
--- a/patches/unapplied/server/1007-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/unapplied/server/1024-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/unapplied/server/1008-Collision-optimisations.patch b/patches/unapplied/server/1025-Collision-optimisations.patch
index 0c6a99e1b7..0c6a99e1b7 100644
--- a/patches/unapplied/server/1008-Collision-optimisations.patch
+++ b/patches/unapplied/server/1025-Collision-optimisations.patch
diff --git a/patches/unapplied/server/1009-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/unapplied/server/1026-Optimise-collision-checking-in-player-move-packet-ha.patch
index 7faeede880..7faeede880 100644
--- a/patches/unapplied/server/1009-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/unapplied/server/1026-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/unapplied/server/1011-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/unapplied/server/1027-Fix-entity-type-tags-suggestions-in-selectors.patch
index d24e7d583c..d24e7d583c 100644
--- a/patches/unapplied/server/1011-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/unapplied/server/1027-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/unapplied/server/1012-Add-Alternate-Current-redstone-implementation.patch b/patches/unapplied/server/1028-Add-Alternate-Current-redstone-implementation.patch
index 2e914661d3..2e914661d3 100644
--- a/patches/unapplied/server/1012-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/unapplied/server/1028-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/unapplied/server/1013-optimize-dirt-and-snow-spreading.patch b/patches/unapplied/server/1029-optimize-dirt-and-snow-spreading.patch
index 49de7fcab9..49de7fcab9 100644
--- a/patches/unapplied/server/1013-optimize-dirt-and-snow-spreading.patch
+++ b/patches/unapplied/server/1029-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/unapplied/server/1014-Properly-resend-entities.patch b/patches/unapplied/server/1030-Properly-resend-entities.patch
index 8bba132319..8bba132319 100644
--- a/patches/unapplied/server/1014-Properly-resend-entities.patch
+++ b/patches/unapplied/server/1030-Properly-resend-entities.patch
diff --git a/patches/unapplied/server/1015-Optimize-Hoppers.patch b/patches/unapplied/server/1031-Optimize-Hoppers.patch
index 6722f4c03b..6722f4c03b 100644
--- a/patches/unapplied/server/1015-Optimize-Hoppers.patch
+++ b/patches/unapplied/server/1031-Optimize-Hoppers.patch
diff --git a/patches/unapplied/server/1016-Improve-performance-of-mass-crafts.patch b/patches/unapplied/server/1032-Improve-performance-of-mass-crafts.patch
index f9839d9135..f9839d9135 100644
--- a/patches/unapplied/server/1016-Improve-performance-of-mass-crafts.patch
+++ b/patches/unapplied/server/1032-Improve-performance-of-mass-crafts.patch
diff --git a/patches/unapplied/server/1017-Actually-optimise-explosions.patch b/patches/unapplied/server/1033-Actually-optimise-explosions.patch
index fa8536ea3c..fa8536ea3c 100644
--- a/patches/unapplied/server/1017-Actually-optimise-explosions.patch
+++ b/patches/unapplied/server/1033-Actually-optimise-explosions.patch
diff --git a/patches/unapplied/server/1018-Optimise-chunk-tick-iteration.patch b/patches/unapplied/server/1034-Optimise-chunk-tick-iteration.patch
index bc67b755cd..bc67b755cd 100644
--- a/patches/unapplied/server/1018-Optimise-chunk-tick-iteration.patch
+++ b/patches/unapplied/server/1034-Optimise-chunk-tick-iteration.patch
diff --git a/patches/unapplied/server/1019-Lag-compensation-ticks.patch b/patches/unapplied/server/1035-Lag-compensation-ticks.patch
index b841ae267d..b841ae267d 100644
--- a/patches/unapplied/server/1019-Lag-compensation-ticks.patch
+++ b/patches/unapplied/server/1035-Lag-compensation-ticks.patch
diff --git a/patches/unapplied/server/1020-Optimise-nearby-player-retrieval.patch b/patches/unapplied/server/1036-Optimise-nearby-player-retrieval.patch
index eae5d781cc..eae5d781cc 100644
--- a/patches/unapplied/server/1020-Optimise-nearby-player-retrieval.patch
+++ b/patches/unapplied/server/1036-Optimise-nearby-player-retrieval.patch
diff --git a/patches/unapplied/server/1021-Distance-manager-tick-timings.patch b/patches/unapplied/server/1037-Distance-manager-tick-timings.patch
index f946d92596..f946d92596 100644
--- a/patches/unapplied/server/1021-Distance-manager-tick-timings.patch
+++ b/patches/unapplied/server/1037-Distance-manager-tick-timings.patch
diff --git a/patches/unapplied/server/1022-Handle-Oversized-block-entities-in-chunks.patch b/patches/unapplied/server/1038-Handle-Oversized-block-entities-in-chunks.patch
index b9ea4832bd..b9ea4832bd 100644
--- a/patches/unapplied/server/1022-Handle-Oversized-block-entities-in-chunks.patch
+++ b/patches/unapplied/server/1038-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/unapplied/server/1023-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/unapplied/server/1039-Send-full-pos-packets-for-hard-colliding-entities.patch
index 6a98c63b52..6a98c63b52 100644
--- a/patches/unapplied/server/1023-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/unapplied/server/1039-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/unapplied/server/1024-API-for-checking-sent-chunks.patch b/patches/unapplied/server/1040-API-for-checking-sent-chunks.patch
index 5ff64c522d..5ff64c522d 100644
--- a/patches/unapplied/server/1024-API-for-checking-sent-chunks.patch
+++ b/patches/unapplied/server/1040-API-for-checking-sent-chunks.patch
diff --git a/patches/unapplied/server/1029-Write-SavedData-IO-async.patch b/patches/unapplied/server/1041-Write-SavedData-IO-async.patch
index 99637aa8f5..99637aa8f5 100644
--- a/patches/unapplied/server/1029-Write-SavedData-IO-async.patch
+++ b/patches/unapplied/server/1041-Write-SavedData-IO-async.patch