Move patch back a bitpool-nonsense

39 files changed, 9 insertions, 9 deletions

diff --git a/patches/server/1073-Separate-dimensiondata-executor.patch b/patches/server/1034-Separate-dimensiondata-executor.patch
index 40c89f1045..40c89f1045 100644
--- a/patches/server/1073-Separate-dimensiondata-executor.patch
+++ b/patches/server/1034-Separate-dimensiondata-executor.patch
diff --git a/patches/server/1034-Always-send-Banner-patterns-to-the-client.patch b/patches/server/1035-Always-send-Banner-patterns-to-the-client.patch
index a5951afc90..a5951afc90 100644
--- a/patches/server/1034-Always-send-Banner-patterns-to-the-client.patch
+++ b/patches/server/1035-Always-send-Banner-patterns-to-the-client.patch
diff --git a/patches/server/1035-Rewrite-dataconverter-system.patch b/patches/server/1036-Rewrite-dataconverter-system.patch
index 7f88441f12..7f88441f12 100644
--- a/patches/server/1035-Rewrite-dataconverter-system.patch
+++ b/patches/server/1036-Rewrite-dataconverter-system.patch
diff --git a/patches/server/1036-Moonrise-optimisation-patches.patch b/patches/server/1037-Moonrise-optimisation-patches.patch
index ae38b2a8aa..b2bbfd3c7a 100644
--- a/patches/server/1036-Moonrise-optimisation-patches.patch
+++ b/patches/server/1037-Moonrise-optimisation-patches.patch
@@ -23410,7 +23410,7 @@ index fc6ce3485dc890f5105a37fe3e344a1460867556..e114e687f2f4503546687fd6792226a6
                  DedicatedServer dedicatedserver1 = new DedicatedServer(optionset, worldLoader.get(), thread, convertable_conversionsession, resourcepackrepository, worldstem, dedicatedserversettings, DataFixers.getDataFixer(), services, LoggerChunkProgressListener::createFromGameruleRadius);
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e18692ad6bdbc8bc2df605833501b1ad888b8b7d..ed1f8c735bf9f13014112056b85ff195b02ee76e 100644
+index 57b242a4a1de49e8869e8ec83e74d60d877a4003..9cb435573d0b1bdf5488bd5b9cef5d2aba6a1c2d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -204,7 +204,7 @@ import org.bukkit.event.server.ServerLoadEvent;
diff --git a/patches/server/1037-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/1038-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index c155a5cca2..c155a5cca2 100644
--- a/patches/server/1037-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/1038-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/1038-API-for-checking-sent-chunks.patch b/patches/server/1039-API-for-checking-sent-chunks.patch
index b8a7aea07d..b8a7aea07d 100644
--- a/patches/server/1038-API-for-checking-sent-chunks.patch
+++ b/patches/server/1039-API-for-checking-sent-chunks.patch
diff --git a/patches/server/1039-Fix-CraftWorld-isChunkGenerated.patch b/patches/server/1040-Fix-CraftWorld-isChunkGenerated.patch
index 2aa2a06b03..2aa2a06b03 100644
--- a/patches/server/1039-Fix-CraftWorld-isChunkGenerated.patch
+++ b/patches/server/1040-Fix-CraftWorld-isChunkGenerated.patch
diff --git a/patches/server/1040-Add-startup-flag-to-disable-gamerule-limits.patch b/patches/server/1041-Add-startup-flag-to-disable-gamerule-limits.patch
index 452a3c6ba7..452a3c6ba7 100644
--- a/patches/server/1040-Add-startup-flag-to-disable-gamerule-limits.patch
+++ b/patches/server/1041-Add-startup-flag-to-disable-gamerule-limits.patch
diff --git a/patches/server/1041-Improved-Watchdog-Support.patch b/patches/server/1042-Improved-Watchdog-Support.patch
index d6ad1f105d..d9040f3b39 100644
--- a/patches/server/1041-Improved-Watchdog-Support.patch
+++ b/patches/server/1042-Improved-Watchdog-Support.patch
@@ -117,7 +117,7 @@ index e114e687f2f4503546687fd6792226a643af8793..90ca25c4aaf92a5639839a7cdaee2ffc
          /* CraftBukkit start - Replace everything
          OptionParser optionparser = new OptionParser();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ed1f8c735bf9f13014112056b85ff195b02ee76e..b29dbab3c26c078eb993183d808149d958857f3a 100644
+index 9cb435573d0b1bdf5488bd5b9cef5d2aba6a1c2d..4ac8bc8dc326ef12c4ffdfdf8325f3111ca5b665 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -317,7 +317,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/1042-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1043-Detail-more-information-in-watchdog-dumps.patch
index 98c659d4a2..98c659d4a2 100644
--- a/patches/server/1042-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/1043-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/1043-Entity-load-save-limit-per-chunk.patch b/patches/server/1044-Entity-load-save-limit-per-chunk.patch
index 7a75cf646d..7a75cf646d 100644
--- a/patches/server/1043-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/1044-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/1044-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1045-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 189786ebed..16f1024afb 100644
--- a/patches/server/1044-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/1045-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
@@ -44,7 +44,7 @@ index a23dc2f8f4475de1ee35bf18a7a8a53233ccac12..226af44fd469053451a0403a95ffb446
          this.used.set(start, start + size);
      }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-index ba1b6760430babcea9338f4243abbaeb27883df7..b256e0d0cfed34f736f6f1f1128c8cbc6ef1f55b 100644
+index ff092c6d0cd436f14a9a4ff5c8ddbb5538d1a8c5..16f07007a0f73ec0c6f421c9b082518e87e8cc7b 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 @@ -51,6 +51,354 @@ public class RegionFile implements AutoCloseable, ca.spottedleaf.moonrise.patche
diff --git a/patches/server/1045-Bundle-spark.patch b/patches/server/1046-Bundle-spark.patch
index 292946d556..84624b4705 100644
--- a/patches/server/1045-Bundle-spark.patch
+++ b/patches/server/1046-Bundle-spark.patch
@@ -279,7 +279,7 @@ index 6b8ed8a0baaf4a57d20e57cec3400af5561ddd79..48604e7f96adc9e226e034054c5e2bad
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b29dbab3c26c078eb993183d808149d958857f3a..38b5eef0b5ff38f9a8dfa59822d7b41336108f49 100644
+index 4ac8bc8dc326ef12c4ffdfdf8325f3111ca5b665..ca70815b73199835b88c9d68c8a01699536d320f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -764,6 +764,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/1046-Improve-performance-of-mass-crafts.patch b/patches/server/1047-Improve-performance-of-mass-crafts.patch
index 7231e230c1..7231e230c1 100644
--- a/patches/server/1046-Improve-performance-of-mass-crafts.patch
+++ b/patches/server/1047-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1047-Incremental-chunk-and-player-saving.patch b/patches/server/1048-Incremental-chunk-and-player-saving.patch
index 08c5b68dc1..573570fbe8 100644
--- a/patches/server/1047-Incremental-chunk-and-player-saving.patch
+++ b/patches/server/1048-Incremental-chunk-and-player-saving.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Incremental chunk and player saving
 Feature patch
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 38b5eef0b5ff38f9a8dfa59822d7b41336108f49..b33b68649e67de08719b30e98650c84f4c3c18d6 100644
+index ca70815b73199835b88c9d68c8a01699536d320f..be6e64d5c858961b19eb7b1b028530c1eb4c68d7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1007,7 +1007,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/1048-Optimise-general-POI-access.patch b/patches/server/1049-Optimise-general-POI-access.patch
index 2fa0832c02..2fa0832c02 100644
--- a/patches/server/1048-Optimise-general-POI-access.patch
+++ b/patches/server/1049-Optimise-general-POI-access.patch
diff --git a/patches/server/1049-Fix-entity-tracker-desync-when-new-players-are-added.patch b/patches/server/1050-Fix-entity-tracker-desync-when-new-players-are-added.patch
index 9737c35436..9737c35436 100644
--- a/patches/server/1049-Fix-entity-tracker-desync-when-new-players-are-added.patch
+++ b/patches/server/1050-Fix-entity-tracker-desync-when-new-players-are-added.patch
diff --git a/patches/server/1050-Lag-compensation-ticks.patch b/patches/server/1051-Lag-compensation-ticks.patch
index 3497e375ef..e4475fead4 100644
--- a/patches/server/1050-Lag-compensation-ticks.patch
+++ b/patches/server/1051-Lag-compensation-ticks.patch
@@ -10,7 +10,7 @@ Areas affected by lag comepnsation:
 Feature patch
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b33b68649e67de08719b30e98650c84f4c3c18d6..e636a96ea6220fda671a31d3d9cdea468a558768 100644
+index be6e64d5c858961b19eb7b1b028530c1eb4c68d7..11a0bf52d891d79e3520de91d270b876871510f7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -331,6 +331,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/1051-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1052-Optimise-collision-checking-in-player-move-packet-ha.patch
index 82b8f60c95..82b8f60c95 100644
--- a/patches/server/1051-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/1052-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/1052-Optional-per-player-mob-spawns.patch b/patches/server/1053-Optional-per-player-mob-spawns.patch
index 79231e71e6..79231e71e6 100644
--- a/patches/server/1052-Optional-per-player-mob-spawns.patch
+++ b/patches/server/1053-Optional-per-player-mob-spawns.patch
diff --git a/patches/server/1053-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/1054-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 0e96e6bf9c..0e96e6bf9c 100644
--- a/patches/server/1053-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/1054-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/1054-Avoid-issues-with-certain-tasks-not-processing-durin.patch b/patches/server/1055-Avoid-issues-with-certain-tasks-not-processing-durin.patch
index 4bb32dd1da..5da4e0387b 100644
--- a/patches/server/1054-Avoid-issues-with-certain-tasks-not-processing-durin.patch
+++ b/patches/server/1055-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 e636a96ea6220fda671a31d3d9cdea468a558768..64b56abf8900d0424100da460fc68ac964394793 100644
+index 11a0bf52d891d79e3520de91d270b876871510f7..317bb0bd16d8125a40c37b75be1d4d0461bcf9ce 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
diff --git a/patches/server/1055-Allow-using-old-ender-pearl-behavior.patch b/patches/server/1056-Allow-using-old-ender-pearl-behavior.patch
index cd17c1aa1f..cd17c1aa1f 100644
--- a/patches/server/1055-Allow-using-old-ender-pearl-behavior.patch
+++ b/patches/server/1056-Allow-using-old-ender-pearl-behavior.patch
diff --git a/patches/server/1056-Block-Enderpearl-Travel-Exploit.patch b/patches/server/1057-Block-Enderpearl-Travel-Exploit.patch
index 1ce0fb851b..1ce0fb851b 100644
--- a/patches/server/1056-Block-Enderpearl-Travel-Exploit.patch
+++ b/patches/server/1057-Block-Enderpearl-Travel-Exploit.patch
diff --git a/patches/server/1057-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/1058-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index 30f853ff98..30f853ff98 100644
--- a/patches/server/1057-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/server/1058-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/1058-Correct-update-cursor.patch b/patches/server/1059-Correct-update-cursor.patch
index 5a1e3ce282..5a1e3ce282 100644
--- a/patches/server/1058-Correct-update-cursor.patch
+++ b/patches/server/1059-Correct-update-cursor.patch
diff --git a/patches/server/1059-Call-CraftPlayer-onEntityRemove-for-all-online-playe.patch b/patches/server/1060-Call-CraftPlayer-onEntityRemove-for-all-online-playe.patch
index cb02caeb92..cb02caeb92 100644
--- a/patches/server/1059-Call-CraftPlayer-onEntityRemove-for-all-online-playe.patch
+++ b/patches/server/1060-Call-CraftPlayer-onEntityRemove-for-all-online-playe.patch
diff --git a/patches/server/1060-Improve-exact-choice-recipe-ingredients.patch b/patches/server/1061-Improve-exact-choice-recipe-ingredients.patch
index eaed7d5bad..eaed7d5bad 100644
--- a/patches/server/1060-Improve-exact-choice-recipe-ingredients.patch
+++ b/patches/server/1061-Improve-exact-choice-recipe-ingredients.patch
diff --git a/patches/server/1061-Eigencraft-redstone-implementation.patch b/patches/server/1062-Eigencraft-redstone-implementation.patch
index 85700695b3..85700695b3 100644
--- a/patches/server/1061-Eigencraft-redstone-implementation.patch
+++ b/patches/server/1062-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/1062-Improve-performance-of-RecipeMap-removeRecipe.patch b/patches/server/1063-Improve-performance-of-RecipeMap-removeRecipe.patch
index 08bbad66b6..08bbad66b6 100644
--- a/patches/server/1062-Improve-performance-of-RecipeMap-removeRecipe.patch
+++ b/patches/server/1063-Improve-performance-of-RecipeMap-removeRecipe.patch
diff --git a/patches/server/1063-Reduce-work-done-in-CraftMapCanvas.drawImage-by-limi.patch b/patches/server/1064-Reduce-work-done-in-CraftMapCanvas.drawImage-by-limi.patch
index 81c7b52685..81c7b52685 100644
--- a/patches/server/1063-Reduce-work-done-in-CraftMapCanvas.drawImage-by-limi.patch
+++ b/patches/server/1064-Reduce-work-done-in-CraftMapCanvas.drawImage-by-limi.patch
diff --git a/patches/server/1064-Add-Alternate-Current-redstone-implementation.patch b/patches/server/1065-Add-Alternate-Current-redstone-implementation.patch
index 246643d457..246643d457 100644
--- a/patches/server/1064-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/1065-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/1065-Fix-incorrect-invulnerability-damage-reduction.patch b/patches/server/1066-Fix-incorrect-invulnerability-damage-reduction.patch
index 3b3dd3d144..3b3dd3d144 100644
--- a/patches/server/1065-Fix-incorrect-invulnerability-damage-reduction.patch
+++ b/patches/server/1066-Fix-incorrect-invulnerability-damage-reduction.patch
diff --git a/patches/server/1066-Fix-NPE-when-EntityResurrectEvent-is-uncancelled.patch b/patches/server/1067-Fix-NPE-when-EntityResurrectEvent-is-uncancelled.patch
index 511cccc084..511cccc084 100644
--- a/patches/server/1066-Fix-NPE-when-EntityResurrectEvent-is-uncancelled.patch
+++ b/patches/server/1067-Fix-NPE-when-EntityResurrectEvent-is-uncancelled.patch
diff --git a/patches/server/1067-API-to-check-if-the-server-is-sleeping.patch b/patches/server/1068-API-to-check-if-the-server-is-sleeping.patch
index 11e9f2e44b..c19dba5aeb 100644
--- a/patches/server/1067-API-to-check-if-the-server-is-sleeping.patch
+++ b/patches/server/1068-API-to-check-if-the-server-is-sleeping.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] API to check if the server is sleeping
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 64b56abf8900d0424100da460fc68ac964394793..5d070f036dae6d93f863c55192b557419634456d 100644
+index 317bb0bd16d8125a40c37b75be1d4d0461bcf9ce..135fb7f722947a57169f0ce584cb031f4c54c854 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -3186,4 +3186,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/1068-API-to-allow-disallow-tick-sleeping.patch b/patches/server/1069-API-to-allow-disallow-tick-sleeping.patch
index 751159901c..1aff91abe2 100644
--- a/patches/server/1068-API-to-allow-disallow-tick-sleeping.patch
+++ b/patches/server/1069-API-to-allow-disallow-tick-sleeping.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] API to allow/disallow tick sleeping
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5d070f036dae6d93f863c55192b557419634456d..c26e3a239441376f2694782d4f07943538677c71 100644
+index 135fb7f722947a57169f0ce584cb031f4c54c854..780582ebaa8deb0c0b0c8de17de5abcebafa4bd3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -332,6 +332,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/1069-Configurable-Entity-Despawn-Time.patch b/patches/server/1070-Configurable-Entity-Despawn-Time.patch
index 3885f857a3..3885f857a3 100644
--- a/patches/server/1069-Configurable-Entity-Despawn-Time.patch
+++ b/patches/server/1070-Configurable-Entity-Despawn-Time.patch
diff --git a/patches/server/1070-Expanded-Art-API.patch b/patches/server/1071-Expanded-Art-API.patch
index 56e4179720..56e4179720 100644
--- a/patches/server/1070-Expanded-Art-API.patch
+++ b/patches/server/1071-Expanded-Art-API.patch
diff --git a/patches/server/1071-Call-ProjectileHitEvent-for-entity-hits.patch b/patches/server/1072-Call-ProjectileHitEvent-for-entity-hits.patch
index 7d6bd931cb..7d6bd931cb 100644
--- a/patches/server/1071-Call-ProjectileHitEvent-for-entity-hits.patch
+++ b/patches/server/1072-Call-ProjectileHitEvent-for-entity-hits.patch