From 4803421326fca1ba974d52844d882d1912ad62a3 Mon Sep 17 00:00:00 2001 From: 96DarkCode96 <76725766+96DarkCode96@users.noreply.github.com> Date: Wed, 11 Dec 2024 19:29:51 +0100 Subject: [PATCH] Fix Player.setPlayerListOrder to send update to clients (#11729) --- ...ayerListOrder-to-send-update-to-clie.patch | 25 +++++++++++++++++++ ...mand-serialization-by-creating-new-.patch} | 0 ...ch => 1036-Properly-resend-entities.patch} | 0 ...037-Switch-Impl-types-to-Holderable.patch} | 0 ...dBounds-and-getBlockState-for-inlin.patch} | 0 ...tem-frames-performance-and-bug-fixe.patch} | 0 ...Manager-and-add-advanced-packet-sup.patch} | 0 ...41-Allow-Saving-of-Oversized-Chunks.patch} | 0 ...042-Flat-bedrock-generator-settings.patch} | 0 ...=> 1043-Entity-Activation-Range-2.0.patch} | 0 ...3-Anti-Xray.patch => 1044-Anti-Xray.patch} | 0 ...city-compression-and-cipher-natives.patch} | 0 ...timize-Collision-to-not-load-chunks.patch} | 0 ...alSelector-Goal.Flag-Set-operations.patch} | 0 ...pers.patch => 1048-Optimize-Hoppers.patch} | 0 ...> 1049-Optimize-Voxel-Shape-Merging.patch} | 0 ...Optimize-Bit-Operations-by-inlining.patch} | 0 ...> 1051-Remove-streams-from-hot-code.patch} | 0 ...er-Remove-Streams-Optimized-collect.patch} | 0 ...-type-tags-suggestions-in-selectors.patch} | 0 ...-Oversized-block-entities-in-chunks.patch} | 0 ...eck-distance-in-entity-interactions.patch} | 0 ...56-optimize-dirt-and-snow-spreading.patch} | 0 ...-getChunkAt-calls-for-loaded-chunks.patch} | 0 ...> 1058-Rewrite-dataconverter-system.patch} | 0 ... 1059-Moonrise-optimisation-patches.patch} | 8 +++--- ...data-to-disk-if-it-serializes-witho.patch} | 0 ...h => 1061-Improved-Watchdog-Support.patch} | 0 ...-more-information-in-watchdog-dumps.patch} | 0 ...63-Entity-load-save-limit-per-chunk.patch} | 0 ...ulate-regionfile-header-if-it-is-co.patch} | 0 ...-Improve-performance-of-mass-crafts.patch} | 0 ...Incremental-chunk-and-player-saving.patch} | 0 ...=> 1067-Optimise-general-POI-access.patch} | 0 ...r-desync-when-new-players-are-added.patch} | 0 ...atch => 1069-Lag-compensation-ticks.patch} | 0 ...n-checking-in-player-move-packet-ha.patch} | 0 ...1071-Optional-per-player-mob-spawns.patch} | 0 ...g-PreCreatureSpawnEvent-with-per-pl.patch} | 0 ...-Eigencraft-redstone-implementation.patch} | 0 ...ate-Current-redstone-implementation.patch} | 0 ...ove-exact-choice-recipe-ingredients.patch} | 0 ...ch => 1076-Implement-chunk-view-API.patch} | 0 43 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 patches/server/1034-Fix-Player.setPlayerListOrder-to-send-update-to-clie.patch rename patches/server/{1034-Fix-incorrect-command-serialization-by-creating-new-.patch => 1035-Fix-incorrect-command-serialization-by-creating-new-.patch} (100%) rename patches/server/{1035-Properly-resend-entities.patch => 1036-Properly-resend-entities.patch} (100%) rename patches/server/{1036-Switch-Impl-types-to-Holderable.patch => 1037-Switch-Impl-types-to-Holderable.patch} (100%) rename patches/server/{1037-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch => 1038-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch} (100%) rename patches/server/{1038-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 1039-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (100%) rename patches/server/{1039-Optimize-Network-Manager-and-add-advanced-packet-sup.patch => 1040-Optimize-Network-Manager-and-add-advanced-packet-sup.patch} (100%) rename patches/server/{1040-Allow-Saving-of-Oversized-Chunks.patch => 1041-Allow-Saving-of-Oversized-Chunks.patch} (100%) rename patches/server/{1041-Flat-bedrock-generator-settings.patch => 1042-Flat-bedrock-generator-settings.patch} (100%) rename patches/server/{1042-Entity-Activation-Range-2.0.patch => 1043-Entity-Activation-Range-2.0.patch} (100%) rename patches/server/{1043-Anti-Xray.patch => 1044-Anti-Xray.patch} (100%) rename patches/server/{1044-Use-Velocity-compression-and-cipher-natives.patch => 1045-Use-Velocity-compression-and-cipher-natives.patch} (100%) rename patches/server/{1045-Optimize-Collision-to-not-load-chunks.patch => 1046-Optimize-Collision-to-not-load-chunks.patch} (100%) rename patches/server/{1046-Optimize-GoalSelector-Goal.Flag-Set-operations.patch => 1047-Optimize-GoalSelector-Goal.Flag-Set-operations.patch} (100%) rename patches/server/{1047-Optimize-Hoppers.patch => 1048-Optimize-Hoppers.patch} (100%) rename patches/server/{1048-Optimize-Voxel-Shape-Merging.patch => 1049-Optimize-Voxel-Shape-Merging.patch} (100%) rename patches/server/{1049-Optimize-Bit-Operations-by-inlining.patch => 1050-Optimize-Bit-Operations-by-inlining.patch} (100%) rename patches/server/{1050-Remove-streams-from-hot-code.patch => 1051-Remove-streams-from-hot-code.patch} (100%) rename patches/server/{1051-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 1052-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%) rename patches/server/{1052-Fix-entity-type-tags-suggestions-in-selectors.patch => 1053-Fix-entity-type-tags-suggestions-in-selectors.patch} (100%) rename patches/server/{1053-Handle-Oversized-block-entities-in-chunks.patch => 1054-Handle-Oversized-block-entities-in-chunks.patch} (100%) rename patches/server/{1054-Check-distance-in-entity-interactions.patch => 1055-Check-distance-in-entity-interactions.patch} (100%) rename patches/server/{1055-optimize-dirt-and-snow-spreading.patch => 1056-optimize-dirt-and-snow-spreading.patch} (100%) rename patches/server/{1056-Optimise-getChunkAt-calls-for-loaded-chunks.patch => 1057-Optimise-getChunkAt-calls-for-loaded-chunks.patch} (100%) rename patches/server/{1057-Rewrite-dataconverter-system.patch => 1058-Rewrite-dataconverter-system.patch} (100%) rename patches/server/{1058-Moonrise-optimisation-patches.patch => 1059-Moonrise-optimisation-patches.patch} (99%) rename patches/server/{1059-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch => 1060-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch} (100%) rename patches/server/{1060-Improved-Watchdog-Support.patch => 1061-Improved-Watchdog-Support.patch} (100%) rename patches/server/{1061-Detail-more-information-in-watchdog-dumps.patch => 1062-Detail-more-information-in-watchdog-dumps.patch} (100%) rename patches/server/{1062-Entity-load-save-limit-per-chunk.patch => 1063-Entity-load-save-limit-per-chunk.patch} (100%) rename patches/server/{1063-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch => 1064-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch} (100%) rename patches/server/{1064-Improve-performance-of-mass-crafts.patch => 1065-Improve-performance-of-mass-crafts.patch} (100%) rename patches/server/{1065-Incremental-chunk-and-player-saving.patch => 1066-Incremental-chunk-and-player-saving.patch} (100%) rename patches/server/{1066-Optimise-general-POI-access.patch => 1067-Optimise-general-POI-access.patch} (100%) rename patches/server/{1067-Fix-entity-tracker-desync-when-new-players-are-added.patch => 1068-Fix-entity-tracker-desync-when-new-players-are-added.patch} (100%) rename patches/server/{1068-Lag-compensation-ticks.patch => 1069-Lag-compensation-ticks.patch} (100%) rename patches/server/{1069-Optimise-collision-checking-in-player-move-packet-ha.patch => 1070-Optimise-collision-checking-in-player-move-packet-ha.patch} (100%) rename patches/server/{1070-Optional-per-player-mob-spawns.patch => 1071-Optional-per-player-mob-spawns.patch} (100%) rename patches/server/{1071-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch => 1072-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch} (100%) rename patches/server/{1072-Eigencraft-redstone-implementation.patch => 1073-Eigencraft-redstone-implementation.patch} (100%) rename patches/server/{1073-Add-Alternate-Current-redstone-implementation.patch => 1074-Add-Alternate-Current-redstone-implementation.patch} (100%) rename patches/server/{1074-Improve-exact-choice-recipe-ingredients.patch => 1075-Improve-exact-choice-recipe-ingredients.patch} (100%) rename patches/server/{1075-Implement-chunk-view-API.patch => 1076-Implement-chunk-view-API.patch} (100%) diff --git a/patches/server/1034-Fix-Player.setPlayerListOrder-to-send-update-to-clie.patch b/patches/server/1034-Fix-Player.setPlayerListOrder-to-send-update-to-clie.patch new file mode 100644 index 0000000000..a42c19217e --- /dev/null +++ b/patches/server/1034-Fix-Player.setPlayerListOrder-to-send-update-to-clie.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: 96DarkCode96 <96darkcode96@gmail.com> +Date: Tue, 10 Dec 2024 15:45:47 +0100 +Subject: [PATCH] Fix Player.setPlayerListOrder to send update to clients + + +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +index d5dc10cf9440f2394e6548c6a3e0160df13c9cae..e9df37ff66700278bc94ea1e42135b92d97d03f7 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +@@ -606,6 +606,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { + Preconditions.checkArgument(order >= 0, "order cannot be negative"); + + this.getHandle().listOrder = order; ++ // Paper start - Send update packet ++ if (getHandle().connection == null) return; // Updates are possible before the player has fully joined ++ for (ServerPlayer player : server.getHandle().players) { ++ if (player.getBukkitEntity().canSee(this)) { ++ player.connection.send(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LIST_ORDER, getHandle())); ++ } ++ } ++ // Paper end - Send update packet + } + + private net.kyori.adventure.text.Component playerListHeader; // Paper - Adventure diff --git a/patches/server/1034-Fix-incorrect-command-serialization-by-creating-new-.patch b/patches/server/1035-Fix-incorrect-command-serialization-by-creating-new-.patch similarity index 100% rename from patches/server/1034-Fix-incorrect-command-serialization-by-creating-new-.patch rename to patches/server/1035-Fix-incorrect-command-serialization-by-creating-new-.patch diff --git a/patches/server/1035-Properly-resend-entities.patch b/patches/server/1036-Properly-resend-entities.patch similarity index 100% rename from patches/server/1035-Properly-resend-entities.patch rename to patches/server/1036-Properly-resend-entities.patch diff --git a/patches/server/1036-Switch-Impl-types-to-Holderable.patch b/patches/server/1037-Switch-Impl-types-to-Holderable.patch similarity index 100% rename from patches/server/1036-Switch-Impl-types-to-Holderable.patch rename to patches/server/1037-Switch-Impl-types-to-Holderable.patch diff --git a/patches/server/1037-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/1038-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch similarity index 100% rename from patches/server/1037-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch rename to patches/server/1038-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch diff --git a/patches/server/1038-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/1039-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch similarity index 100% rename from patches/server/1038-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch rename to patches/server/1039-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch diff --git a/patches/server/1039-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/1040-Optimize-Network-Manager-and-add-advanced-packet-sup.patch similarity index 100% rename from patches/server/1039-Optimize-Network-Manager-and-add-advanced-packet-sup.patch rename to patches/server/1040-Optimize-Network-Manager-and-add-advanced-packet-sup.patch diff --git a/patches/server/1040-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/1041-Allow-Saving-of-Oversized-Chunks.patch similarity index 100% rename from patches/server/1040-Allow-Saving-of-Oversized-Chunks.patch rename to patches/server/1041-Allow-Saving-of-Oversized-Chunks.patch diff --git a/patches/server/1041-Flat-bedrock-generator-settings.patch b/patches/server/1042-Flat-bedrock-generator-settings.patch similarity index 100% rename from patches/server/1041-Flat-bedrock-generator-settings.patch rename to patches/server/1042-Flat-bedrock-generator-settings.patch diff --git a/patches/server/1042-Entity-Activation-Range-2.0.patch b/patches/server/1043-Entity-Activation-Range-2.0.patch similarity index 100% rename from patches/server/1042-Entity-Activation-Range-2.0.patch rename to patches/server/1043-Entity-Activation-Range-2.0.patch diff --git a/patches/server/1043-Anti-Xray.patch b/patches/server/1044-Anti-Xray.patch similarity index 100% rename from patches/server/1043-Anti-Xray.patch rename to patches/server/1044-Anti-Xray.patch diff --git a/patches/server/1044-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1045-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/1044-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/1045-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/1045-Optimize-Collision-to-not-load-chunks.patch b/patches/server/1046-Optimize-Collision-to-not-load-chunks.patch similarity index 100% rename from patches/server/1045-Optimize-Collision-to-not-load-chunks.patch rename to patches/server/1046-Optimize-Collision-to-not-load-chunks.patch diff --git a/patches/server/1046-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/1047-Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/server/1046-Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/server/1047-Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/1047-Optimize-Hoppers.patch b/patches/server/1048-Optimize-Hoppers.patch similarity index 100% rename from patches/server/1047-Optimize-Hoppers.patch rename to patches/server/1048-Optimize-Hoppers.patch diff --git a/patches/server/1048-Optimize-Voxel-Shape-Merging.patch b/patches/server/1049-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/1048-Optimize-Voxel-Shape-Merging.patch rename to patches/server/1049-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/1049-Optimize-Bit-Operations-by-inlining.patch b/patches/server/1050-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/1049-Optimize-Bit-Operations-by-inlining.patch rename to patches/server/1050-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/1050-Remove-streams-from-hot-code.patch b/patches/server/1051-Remove-streams-from-hot-code.patch similarity index 100% rename from patches/server/1050-Remove-streams-from-hot-code.patch rename to patches/server/1051-Remove-streams-from-hot-code.patch diff --git a/patches/server/1051-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1052-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/1051-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/1052-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/1052-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1053-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/1052-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/1053-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/1053-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1054-Handle-Oversized-block-entities-in-chunks.patch similarity index 100% rename from patches/server/1053-Handle-Oversized-block-entities-in-chunks.patch rename to patches/server/1054-Handle-Oversized-block-entities-in-chunks.patch diff --git a/patches/server/1054-Check-distance-in-entity-interactions.patch b/patches/server/1055-Check-distance-in-entity-interactions.patch similarity index 100% rename from patches/server/1054-Check-distance-in-entity-interactions.patch rename to patches/server/1055-Check-distance-in-entity-interactions.patch diff --git a/patches/server/1055-optimize-dirt-and-snow-spreading.patch b/patches/server/1056-optimize-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/1055-optimize-dirt-and-snow-spreading.patch rename to patches/server/1056-optimize-dirt-and-snow-spreading.patch diff --git a/patches/server/1056-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/1057-Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 100% rename from patches/server/1056-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to patches/server/1057-Optimise-getChunkAt-calls-for-loaded-chunks.patch diff --git a/patches/server/1057-Rewrite-dataconverter-system.patch b/patches/server/1058-Rewrite-dataconverter-system.patch similarity index 100% rename from patches/server/1057-Rewrite-dataconverter-system.patch rename to patches/server/1058-Rewrite-dataconverter-system.patch diff --git a/patches/server/1058-Moonrise-optimisation-patches.patch b/patches/server/1059-Moonrise-optimisation-patches.patch similarity index 99% rename from patches/server/1058-Moonrise-optimisation-patches.patch rename to patches/server/1059-Moonrise-optimisation-patches.patch index 4524413236..7f86f8c5a1 100644 --- a/patches/server/1058-Moonrise-optimisation-patches.patch +++ b/patches/server/1059-Moonrise-optimisation-patches.patch @@ -36227,10 +36227,10 @@ index ca62105a0ff0aa69385cbf2018f8fe6a4bb69fd4..92d9f0ea8f7810ae20d3996f49aefa53 // Paper start - implement pointers diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d5dc10cf9440f2394e6548c6a3e0160df13c9cae..20f64850cb42d986358f01ffcdb42187e1684bca 100644 +index e9df37ff66700278bc94ea1e42135b92d97d03f7..6a647cab8b2e476987931486e290703b8726f2c7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3519,7 +3519,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3527,7 +3527,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public void setViewDistance(final int viewDistance) { @@ -36241,7 +36241,7 @@ index d5dc10cf9440f2394e6548c6a3e0160df13c9cae..20f64850cb42d986358f01ffcdb42187 } @Override -@@ -3529,7 +3531,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3537,7 +3539,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public void setSimulationDistance(final int simulationDistance) { @@ -36252,7 +36252,7 @@ index d5dc10cf9440f2394e6548c6a3e0160df13c9cae..20f64850cb42d986358f01ffcdb42187 } @Override -@@ -3539,7 +3543,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3547,7 +3551,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public void setSendViewDistance(final int viewDistance) { diff --git a/patches/server/1059-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/1060-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/1059-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/1060-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/1060-Improved-Watchdog-Support.patch b/patches/server/1061-Improved-Watchdog-Support.patch similarity index 100% rename from patches/server/1060-Improved-Watchdog-Support.patch rename to patches/server/1061-Improved-Watchdog-Support.patch diff --git a/patches/server/1061-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1062-Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/server/1061-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/1062-Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/server/1062-Entity-load-save-limit-per-chunk.patch b/patches/server/1063-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/1062-Entity-load-save-limit-per-chunk.patch rename to patches/server/1063-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/1063-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1064-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/1063-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/1064-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/1064-Improve-performance-of-mass-crafts.patch b/patches/server/1065-Improve-performance-of-mass-crafts.patch similarity index 100% rename from patches/server/1064-Improve-performance-of-mass-crafts.patch rename to patches/server/1065-Improve-performance-of-mass-crafts.patch diff --git a/patches/server/1065-Incremental-chunk-and-player-saving.patch b/patches/server/1066-Incremental-chunk-and-player-saving.patch similarity index 100% rename from patches/server/1065-Incremental-chunk-and-player-saving.patch rename to patches/server/1066-Incremental-chunk-and-player-saving.patch diff --git a/patches/server/1066-Optimise-general-POI-access.patch b/patches/server/1067-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/1066-Optimise-general-POI-access.patch rename to patches/server/1067-Optimise-general-POI-access.patch diff --git a/patches/server/1067-Fix-entity-tracker-desync-when-new-players-are-added.patch b/patches/server/1068-Fix-entity-tracker-desync-when-new-players-are-added.patch similarity index 100% rename from patches/server/1067-Fix-entity-tracker-desync-when-new-players-are-added.patch rename to patches/server/1068-Fix-entity-tracker-desync-when-new-players-are-added.patch diff --git a/patches/server/1068-Lag-compensation-ticks.patch b/patches/server/1069-Lag-compensation-ticks.patch similarity index 100% rename from patches/server/1068-Lag-compensation-ticks.patch rename to patches/server/1069-Lag-compensation-ticks.patch diff --git a/patches/server/1069-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1070-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/server/1069-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/1070-Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/server/1070-Optional-per-player-mob-spawns.patch b/patches/server/1071-Optional-per-player-mob-spawns.patch similarity index 100% rename from patches/server/1070-Optional-per-player-mob-spawns.patch rename to patches/server/1071-Optional-per-player-mob-spawns.patch diff --git a/patches/server/1071-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/1072-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch similarity index 100% rename from patches/server/1071-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch rename to patches/server/1072-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch diff --git a/patches/server/1072-Eigencraft-redstone-implementation.patch b/patches/server/1073-Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/1072-Eigencraft-redstone-implementation.patch rename to patches/server/1073-Eigencraft-redstone-implementation.patch diff --git a/patches/server/1073-Add-Alternate-Current-redstone-implementation.patch b/patches/server/1074-Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/1073-Add-Alternate-Current-redstone-implementation.patch rename to patches/server/1074-Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/1074-Improve-exact-choice-recipe-ingredients.patch b/patches/server/1075-Improve-exact-choice-recipe-ingredients.patch similarity index 100% rename from patches/server/1074-Improve-exact-choice-recipe-ingredients.patch rename to patches/server/1075-Improve-exact-choice-recipe-ingredients.patch diff --git a/patches/server/1075-Implement-chunk-view-API.patch b/patches/server/1076-Implement-chunk-view-API.patch similarity index 100% rename from patches/server/1075-Implement-chunk-view-API.patch rename to patches/server/1076-Implement-chunk-view-API.patch