Move patches around

33 files changed, 10 insertions, 10 deletions

diff --git a/patches/api/0496-WIP-DataComponent-API.patch b/patches/api/0495-WIP-DataComponent-API.patch
index 9c190e3243..9c190e3243 100644
--- a/patches/api/0496-WIP-DataComponent-API.patch
+++ b/patches/api/0495-WIP-DataComponent-API.patch
diff --git a/patches/api/0495-Optimise-color-distance-check-in-MapPalette-by-remov.patch b/patches/api/0496-Optimise-color-distance-check-in-MapPalette-by-remov.patch
index 0c3fea12ea..0c3fea12ea 100644
--- a/patches/api/0495-Optimise-color-distance-check-in-MapPalette-by-remov.patch
+++ b/patches/api/0496-Optimise-color-distance-check-in-MapPalette-by-remov.patch
diff --git a/patches/server/1066-WIP-DataComponent-API.patch b/patches/server/1036-WIP-DataComponent-API.patch
index 552ac83ab0..552ac83ab0 100644
--- a/patches/server/1066-WIP-DataComponent-API.patch
+++ b/patches/server/1036-WIP-DataComponent-API.patch
diff --git a/patches/server/1036-Always-send-Banner-patterns-to-the-client.patch b/patches/server/1037-Always-send-Banner-patterns-to-the-client.patch
index a5951afc90..a5951afc90 100644
--- a/patches/server/1036-Always-send-Banner-patterns-to-the-client.patch
+++ b/patches/server/1037-Always-send-Banner-patterns-to-the-client.patch
diff --git a/patches/server/1037-Rewrite-dataconverter-system.patch b/patches/server/1038-Rewrite-dataconverter-system.patch
index 71437e89b2..71437e89b2 100644
--- a/patches/server/1037-Rewrite-dataconverter-system.patch
+++ b/patches/server/1038-Rewrite-dataconverter-system.patch
diff --git a/patches/server/1038-Moonrise-optimisation-patches.patch b/patches/server/1039-Moonrise-optimisation-patches.patch
index 09ebd46947..09ebd46947 100644
--- a/patches/server/1038-Moonrise-optimisation-patches.patch
+++ b/patches/server/1039-Moonrise-optimisation-patches.patch
diff --git a/patches/server/1039-API-for-checking-sent-chunks.patch b/patches/server/1040-API-for-checking-sent-chunks.patch
index 822754301b..33cbf04ef5 100644
--- a/patches/server/1039-API-for-checking-sent-chunks.patch
+++ b/patches/server/1040-API-for-checking-sent-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] API for checking sent chunks
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 73ee1ba0b70859cc9c012ab32ad04e8ae2a73e30..92fb2f976ae1c36b152733c28f223337e7f8632e 100644
+index 4f1b3b38d1eec331ab67307eb0e9e62621ce3cd5..d0010dfd22463986bf3be9b3ee015ce92735753e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3498,6 +3498,35 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/1040-Fix-CraftWorld-isChunkGenerated.patch b/patches/server/1041-Fix-CraftWorld-isChunkGenerated.patch
index bf009e18a3..bf009e18a3 100644
--- a/patches/server/1040-Fix-CraftWorld-isChunkGenerated.patch
+++ b/patches/server/1041-Fix-CraftWorld-isChunkGenerated.patch
diff --git a/patches/server/1041-Add-startup-flag-to-disable-gamerule-limits.patch b/patches/server/1042-Add-startup-flag-to-disable-gamerule-limits.patch
index 452a3c6ba7..452a3c6ba7 100644
--- a/patches/server/1041-Add-startup-flag-to-disable-gamerule-limits.patch
+++ b/patches/server/1042-Add-startup-flag-to-disable-gamerule-limits.patch
diff --git a/patches/server/1042-Improved-Watchdog-Support.patch b/patches/server/1043-Improved-Watchdog-Support.patch
index 85b1434e1b..85b1434e1b 100644
--- a/patches/server/1042-Improved-Watchdog-Support.patch
+++ b/patches/server/1043-Improved-Watchdog-Support.patch
diff --git a/patches/server/1043-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1044-Detail-more-information-in-watchdog-dumps.patch
index 2d5148854d..2d5148854d 100644
--- a/patches/server/1043-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/1044-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/1044-Entity-load-save-limit-per-chunk.patch b/patches/server/1045-Entity-load-save-limit-per-chunk.patch
index 7a75cf646d..7a75cf646d 100644
--- a/patches/server/1044-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/1045-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/1045-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1046-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index d0af0f3027..d0af0f3027 100644
--- a/patches/server/1045-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/1046-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/1046-Bundle-spark.patch b/patches/server/1047-Bundle-spark.patch
index 6474f92054..00be00c19e 100644
--- a/patches/server/1046-Bundle-spark.patch
+++ b/patches/server/1047-Bundle-spark.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Bundle spark
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 3288d59c9635819aef0bd864c64cb80e339c050f..f5104c3232b4ad1bc486490d17a8877d603c7d8d 100644
+index 9e6c2a4630ce75e4115f76b5e7a1e0b50e8b3197..ee5f662ed0e84be997807a9faf97191ef4fc0449 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -76,6 +76,10 @@ dependencies {
diff --git a/patches/server/1047-Improve-performance-of-mass-crafts.patch b/patches/server/1048-Improve-performance-of-mass-crafts.patch
index 7231e230c1..7231e230c1 100644
--- a/patches/server/1047-Improve-performance-of-mass-crafts.patch
+++ b/patches/server/1048-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1048-Incremental-chunk-and-player-saving.patch b/patches/server/1049-Incremental-chunk-and-player-saving.patch
index 30f35bb821..19e7e9ed59 100644
--- a/patches/server/1048-Incremental-chunk-and-player-saving.patch
+++ b/patches/server/1049-Incremental-chunk-and-player-saving.patch
@@ -86,7 +86,7 @@ index 7b936a01888d71fe305863054471b6b4a3aa95b8..c09c718c1b1c9f27fdf1e4160b2df688
          // Paper start - add close param
          this.save(progressListener, flush, savingDisabled, false);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8ceeebb561046933cba0725e15732fa074226884..8c9148426f23cbbdfaf7ae66657d1a620f8bd853 100644
+index dda53c52fab7c02f39451335fe0bfe36852ac994..167ab6346edb8f29c29a7327f031c0f5df71acf1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -221,6 +221,7 @@ import org.bukkit.inventory.MainHand;
diff --git a/patches/server/1049-Optimise-general-POI-access.patch b/patches/server/1050-Optimise-general-POI-access.patch
index 2fa0832c02..2fa0832c02 100644
--- a/patches/server/1049-Optimise-general-POI-access.patch
+++ b/patches/server/1050-Optimise-general-POI-access.patch
diff --git a/patches/server/1050-Fix-entity-tracker-desync-when-new-players-are-added.patch b/patches/server/1051-Fix-entity-tracker-desync-when-new-players-are-added.patch
index d8a7d54cb0..d8a7d54cb0 100644
--- a/patches/server/1050-Fix-entity-tracker-desync-when-new-players-are-added.patch
+++ b/patches/server/1051-Fix-entity-tracker-desync-when-new-players-are-added.patch
diff --git a/patches/server/1051-Lag-compensation-ticks.patch b/patches/server/1052-Lag-compensation-ticks.patch
index 49158b5c6c..8fc7383de7 100644
--- a/patches/server/1051-Lag-compensation-ticks.patch
+++ b/patches/server/1052-Lag-compensation-ticks.patch
@@ -65,7 +65,7 @@ index 504c996220b278c194c93e001a3b326d549868ec..a96f859a5d0c6ec692d4627a69f3c9ee
  
          if (this.hasDelayedDestroy) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4836b01323abb125289982ef3ceca09d6a9cfc3b..e86314de8d908a0c3e9f17d3e163c11180cf3f59 100644
+index 59c992173fda6153c58722caae061b0e6bee86a1..6a3a8f0466998409a01223bc0c16d92b96e50118 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -4051,6 +4051,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/1052-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1053-Optimise-collision-checking-in-player-move-packet-ha.patch
index 82b8f60c95..82b8f60c95 100644
--- a/patches/server/1052-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/1053-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/1053-Optional-per-player-mob-spawns.patch b/patches/server/1054-Optional-per-player-mob-spawns.patch
index 90f5fa951b..90f5fa951b 100644
--- a/patches/server/1053-Optional-per-player-mob-spawns.patch
+++ b/patches/server/1054-Optional-per-player-mob-spawns.patch
diff --git a/patches/server/1054-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/1055-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index e2a568cb21..a4379980b1 100644
--- a/patches/server/1054-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/1055-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
@@ -60,7 +60,7 @@ index b1ecc218034944533967375d11297705c3fc01a3..aaaadb7be8abf867624a1ca83371595b
              spawnercreature_d = NaturalSpawner.createState(naturalSpawnChunkCount, this.level.getAllEntities(), this::getFullChunk, null, true);
          } else {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8cc02ee9b1a710e35eb65a5a095681cc7dc542bb..4e4e5b7e8c387cf13cf5bc5e39d334c3222c9103 100644
+index f28babf8c778ef570d35e1aaa88467160cf3f1b1..b525369fb6f3bb80c1553ae41b1e3bddeda29936 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -307,6 +307,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -72,7 +72,7 @@ index 8cc02ee9b1a710e35eb65a5a095681cc7dc542bb..4e4e5b7e8c387cf13cf5bc5e39d334c3
      // CraftBukkit start
      public CraftPlayer.TransferCookieConnection transferCookieConnection;
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 0beb5ab48c5405d9bc2ad8d0c430312f456d38c2..5297798c2be1ba85569c2b92ed221956bf75477a 100644
+index 12ebd7829c7f6814ccd79ae96aa9023afcc64696..c1b76a1ebc1eea7ab70cf61d8175a31794dd122a 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -299,6 +299,11 @@ public final class NaturalSpawner {
diff --git a/patches/server/1055-Avoid-issues-with-certain-tasks-not-processing-durin.patch b/patches/server/1056-Avoid-issues-with-certain-tasks-not-processing-durin.patch
index 180648d806..4bb32dd1da 100644
--- a/patches/server/1055-Avoid-issues-with-certain-tasks-not-processing-durin.patch
+++ b/patches/server/1056-Avoid-issues-with-certain-tasks-not-processing-durin.patch
@@ -11,7 +11,7 @@ sleep by default, which avoids the problem and makes it more obvious to check if
 enabled. We also unload chunks during sleep to prevent memory leaks caused by plugin chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9dfa6bb83469620a446509656ea1ad140b2e683f..af8dbfcc9df105896c8574d2d9dd647ac30ae04d 100644
+index e636a96ea6220fda671a31d3d9cdea468a558768..64b56abf8900d0424100da460fc68ac964394793 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1638,6 +1638,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -32,7 +32,7 @@ index 9dfa6bb83469620a446509656ea1ad140b2e683f..af8dbfcc9df105896c8574d2d9dd647a
                  this.tickConnection();
                  this.server.spark.tickEnd(((double)(System.nanoTime() - lastTick) / 1000000D)); // Paper - spark
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-index 52e61f75f922a075ccc745198f4ba6ad8fa58ea2..149a542c4afa09d491cb33ae33563ba15786758d 100644
+index a2633780619d73c29a23cb8b6a208ca9ba549fb0..c3ec370b83b895be0f03662e3884fa4a2442a2a6 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
 @@ -160,7 +160,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
diff --git a/patches/server/1056-Allow-using-old-ender-pearl-behavior.patch b/patches/server/1057-Allow-using-old-ender-pearl-behavior.patch
index 116240194a..6f44fde3f4 100644
--- a/patches/server/1056-Allow-using-old-ender-pearl-behavior.patch
+++ b/patches/server/1057-Allow-using-old-ender-pearl-behavior.patch
@@ -9,7 +9,7 @@ When enabled, ender pearls will not load chunks and will save to the world inste
 public net.minecraft.world.entity.projectile.Projectile cachedOwner
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4e4e5b7e8c387cf13cf5bc5e39d334c3222c9103..cffbd3300967e5d80b5973b35a76235bb2aa1b73 100644
+index b525369fb6f3bb80c1553ae41b1e3bddeda29936..2e8ecf3bbb9f9ceba6f896738fa1ab8e2bd0fed6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -836,6 +836,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -30,7 +30,7 @@ index 4e4e5b7e8c387cf13cf5bc5e39d334c3222c9103..cffbd3300967e5d80b5973b35a76235b
      }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index cf42042c754b30e41c0ec8a6a15195369bdbd199..1fcd9cd9344b0d2c4752042b07142db7d727dce8 100644
+index a03ff473a683611670ee274b0eec5a395ee6981a..30de3d1a7792c38ae946f19cb0e14637919b5001 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -602,7 +602,13 @@ public abstract class PlayerList {
diff --git a/patches/server/1057-Block-Enderpearl-Travel-Exploit.patch b/patches/server/1058-Block-Enderpearl-Travel-Exploit.patch
index 75bce7f50b..75bce7f50b 100644
--- a/patches/server/1057-Block-Enderpearl-Travel-Exploit.patch
+++ b/patches/server/1058-Block-Enderpearl-Travel-Exploit.patch
diff --git a/patches/server/1058-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/1059-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index 30f853ff98..30f853ff98 100644
--- a/patches/server/1058-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/server/1059-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/1059-Correct-update-cursor.patch b/patches/server/1060-Correct-update-cursor.patch
index 9d4e655ebb..9d4e655ebb 100644
--- a/patches/server/1059-Correct-update-cursor.patch
+++ b/patches/server/1060-Correct-update-cursor.patch
diff --git a/patches/server/1060-Call-CraftPlayer-onEntityRemove-for-all-online-playe.patch b/patches/server/1061-Call-CraftPlayer-onEntityRemove-for-all-online-playe.patch
index fd0f3377d3..fd0f3377d3 100644
--- a/patches/server/1060-Call-CraftPlayer-onEntityRemove-for-all-online-playe.patch
+++ b/patches/server/1061-Call-CraftPlayer-onEntityRemove-for-all-online-playe.patch
diff --git a/patches/server/1061-Improve-exact-choice-recipe-ingredients.patch b/patches/server/1062-Improve-exact-choice-recipe-ingredients.patch
index a7270cced5..a7270cced5 100644
--- a/patches/server/1061-Improve-exact-choice-recipe-ingredients.patch
+++ b/patches/server/1062-Improve-exact-choice-recipe-ingredients.patch
diff --git a/patches/server/1062-Eigencraft-redstone-implementation.patch b/patches/server/1063-Eigencraft-redstone-implementation.patch
index 85700695b3..85700695b3 100644
--- a/patches/server/1062-Eigencraft-redstone-implementation.patch
+++ b/patches/server/1063-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/1063-Improve-performance-of-RecipeMap-removeRecipe.patch b/patches/server/1064-Improve-performance-of-RecipeMap-removeRecipe.patch
index 08bbad66b6..08bbad66b6 100644
--- a/patches/server/1063-Improve-performance-of-RecipeMap-removeRecipe.patch
+++ b/patches/server/1064-Improve-performance-of-RecipeMap-removeRecipe.patch
diff --git a/patches/server/1064-Reduce-work-done-in-CraftMapCanvas.drawImage-by-limi.patch b/patches/server/1065-Reduce-work-done-in-CraftMapCanvas.drawImage-by-limi.patch
index 81c7b52685..81c7b52685 100644
--- a/patches/server/1064-Reduce-work-done-in-CraftMapCanvas.drawImage-by-limi.patch
+++ b/patches/server/1065-Reduce-work-done-in-CraftMapCanvas.drawImage-by-limi.patch
diff --git a/patches/server/1065-Add-Alternate-Current-redstone-implementation.patch b/patches/server/1066-Add-Alternate-Current-redstone-implementation.patch
index 6e77b53180..6e77b53180 100644
--- a/patches/server/1065-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/1066-Add-Alternate-Current-redstone-implementation.patch