From ff3f449b334012fd611ad8cfea321f9925f6130d Mon Sep 17 00:00:00 2001 From: Jason <11360596+jpenilla@users.noreply.github.com> Date: Tue, 24 Aug 2021 18:45:40 -0500 Subject: [PATCH] Squash "Clear SyncLoadInfo" into "Add debug for sync chunk loads" and add tab completion for the clear argument (#6483) --- .../0376-Add-debug-for-sync-chunk-loads.patch | 38 +++++++++++++++--- .../server/0470-Paper-dumpitem-command.patch | 6 +-- patches/server/0682-Clear-SyncLoadInfo.patch | 40 ------------------- ... => 0682-ItemStack-repair-check-API.patch} | 0 ....patch => 0683-More-Enchantment-API.patch} | 0 ...option-to-load-extra-plugin-jars-no.patch} | 0 ...-and-optimise-world-force-upgrading.patch} | 0 ...PI.patch => 0686-Add-Mob-lookAt-API.patch} | 0 ...0687-Add-Unix-domain-socket-support.patch} | 0 ... => 0688-Add-EntityInsideBlockEvent.patch} | 0 ...89-Attributes-API-for-item-defaults.patch} | 0 ...hantCustom-emit-PlayerPurchaseEvent.patch} | 0 ...ause-to-Weather-ThunderChangeEvents.patch} | 2 +- ...patch => 0692-More-Lidded-Block-API.patch} | 0 ...93-Limit-item-frame-cursors-on-maps.patch} | 2 +- ...0694-Add-PufferFishStateChangeEvent.patch} | 0 ... => 0695-Add-PlayerKickEvent-causes.patch} | 4 +- ...erBucketEmptyEvent-result-itemstack.patch} | 0 ...tedContainer-instead-of-ReentrantLo.patch} | 0 ...-to-fix-items-merging-through-walls.patch} | 2 +- ...h => 0699-Add-BellRevealRaiderEvent.patch} | 0 ... 0700-Fix-invulnerable-end-crystals.patch} | 2 +- ...01-Add-ElderGuardianAppearanceEvent.patch} | 0 ...0702-Fix-dangerous-end-portal-logic.patch} | 0 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} | 0 ...-Make-item-validations-configurable.patch} | 0 ...patch => 0705-Line-Of-Sight-Changes.patch} | 4 +- ... => 0706-add-per-world-spawn-limits.patch} | 4 +- ...plashEvent-for-water-splash-potions.patch} | 0 ...tus-dataconverter-for-pre-1.13-chun.patch} | 0 ... => 0709-Add-Feature-Generation-API.patch} | 0 ...layerDropItemEvent-using-wrong-item.patch} | 2 +- ...traces-in-log-messages-crash-report.patch} | 0 ...=> 0712-Missing-Entity-Behavior-API.patch} | 0 ...ect-for-book-edit-is-called-on-main.patch} | 2 +- ...d-git-branch-and-commit-to-manifest.patch} | 2 +- ...0715-Improve-CraftChunk-getEntities.patch} | 0 ...of-Block-applyBoneMeal-always-being.patch} | 0 ...tChunkIfLoadedImmediately-in-places.patch} | 2 +- ...rom-signs-not-firing-command-events.patch} | 2 +- ...ch => 0719-Adds-PlayerArmSwingEvent.patch} | 0 ...-event-leave-message-not-being-sent.patch} | 2 +- ...-for-mobs-immune-to-default-effects.patch} | 4 +- ...correct-message-for-outdated-client.patch} | 0 ...chantOffer-BuyB-Only-AssertionError.patch} | 0 ...-t-apply-cramming-damage-to-players.patch} | 4 +- ...d-timings-for-sensors-and-behaviors.patch} | 2 +- ...-bunch-of-missing-forceDrop-toggles.patch} | 0 ...inger-API.patch => 0727-Stinger-API.patch} | 0 ...cy-issue-with-empty-map-items-in-CB.patch} | 0 ... => 0729-Add-System.out-err-catcher.patch} | 0 ... => 0730-Fix-test-not-bootstrapping.patch} | 0 ...-to-contain-the-source-jars-in-stac.patch} | 0 ...-Improve-boat-collision-performance.patch} | 2 +- ...AFK-kick-while-watching-end-credits.patch} | 2 +- ...iting-of-comments-to-server.propert.patch} | 0 ...tch => 0735-Add-PlayerSetSpawnEvent.patch} | 6 +-- ...rs-respect-inventory-max-stack-size.patch} | 0 ...ize-entity-tracker-passenger-checks.patch} | 0 ...-option-for-Piglins-guarding-chests.patch} | 2 +- ...=> 0739-Added-EntityDamageItemEvent.patch} | 0 ...timize-indirect-passenger-iteration.patch} | 0 ...osition-losing-precision-millions-o.patch} | 0 ...em-frame-map-cursor-update-interval.patch} | 2 +- ...Make-EntityUnleashEvent-cancellable.patch} | 0 ...744-Clear-bucket-NBT-after-dispense.patch} | 0 ... 0745-ChunkMap.mainInvokingExecutor.patch} | 0 ...PlayerBucketFillEvent-when-no-fluid.patch} | 0 ...-dispatch-thread-to-be-a-daemon-thr.patch} | 0 ...ct-despawn-rate-in-item-merge-check.patch} | 0 ...stonRetractEvent-to-fix-duplication.patch} | 0 ...arget-without-changing-other-things.patch} | 0 ...-bed-handling-for-custom-dimensions.patch} | 0 73 files changed, 63 insertions(+), 77 deletions(-) delete mode 100644 patches/server/0682-Clear-SyncLoadInfo.patch rename patches/server/{0683-ItemStack-repair-check-API.patch => 0682-ItemStack-repair-check-API.patch} (100%) rename patches/server/{0684-More-Enchantment-API.patch => 0683-More-Enchantment-API.patch} (100%) rename patches/server/{0685-Add-command-line-option-to-load-extra-plugin-jars-no.patch => 0684-Add-command-line-option-to-load-extra-plugin-jars-no.patch} (100%) rename patches/server/{0686-Fix-and-optimise-world-force-upgrading.patch => 0685-Fix-and-optimise-world-force-upgrading.patch} (100%) rename patches/server/{0687-Add-Mob-lookAt-API.patch => 0686-Add-Mob-lookAt-API.patch} (100%) rename patches/server/{0688-Add-Unix-domain-socket-support.patch => 0687-Add-Unix-domain-socket-support.patch} (100%) rename patches/server/{0689-Add-EntityInsideBlockEvent.patch => 0688-Add-EntityInsideBlockEvent.patch} (100%) rename patches/server/{0690-Attributes-API-for-item-defaults.patch => 0689-Attributes-API-for-item-defaults.patch} (100%) rename patches/server/{0691-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch => 0690-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch} (100%) rename patches/server/{0692-Add-cause-to-Weather-ThunderChangeEvents.patch => 0691-Add-cause-to-Weather-ThunderChangeEvents.patch} (98%) rename patches/server/{0693-More-Lidded-Block-API.patch => 0692-More-Lidded-Block-API.patch} (100%) rename patches/server/{0694-Limit-item-frame-cursors-on-maps.patch => 0693-Limit-item-frame-cursors-on-maps.patch} (95%) rename patches/server/{0695-Add-PufferFishStateChangeEvent.patch => 0694-Add-PufferFishStateChangeEvent.patch} (100%) rename patches/server/{0696-Add-PlayerKickEvent-causes.patch => 0695-Add-PlayerKickEvent-causes.patch} (99%) rename patches/server/{0697-Fix-PlayerBucketEmptyEvent-result-itemstack.patch => 0696-Fix-PlayerBucketEmptyEvent-result-itemstack.patch} (100%) rename patches/server/{0698-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch => 0697-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch} (100%) rename patches/server/{0699-Add-option-to-fix-items-merging-through-walls.patch => 0698-Add-option-to-fix-items-merging-through-walls.patch} (96%) rename patches/server/{0700-Add-BellRevealRaiderEvent.patch => 0699-Add-BellRevealRaiderEvent.patch} (100%) rename patches/server/{0701-Fix-invulnerable-end-crystals.patch => 0700-Fix-invulnerable-end-crystals.patch} (98%) rename patches/server/{0702-Add-ElderGuardianAppearanceEvent.patch => 0701-Add-ElderGuardianAppearanceEvent.patch} (100%) rename patches/server/{0703-Fix-dangerous-end-portal-logic.patch => 0702-Fix-dangerous-end-portal-logic.patch} (100%) rename patches/server/{0704-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0703-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%) rename patches/server/{0705-Make-item-validations-configurable.patch => 0704-Make-item-validations-configurable.patch} (100%) rename patches/server/{0706-Line-Of-Sight-Changes.patch => 0705-Line-Of-Sight-Changes.patch} (95%) rename patches/server/{0707-add-per-world-spawn-limits.patch => 0706-add-per-world-spawn-limits.patch} (92%) rename patches/server/{0708-Fix-PotionSplashEvent-for-water-splash-potions.patch => 0707-Fix-PotionSplashEvent-for-water-splash-potions.patch} (100%) rename patches/server/{0709-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch => 0708-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch} (100%) rename patches/server/{0710-Add-Feature-Generation-API.patch => 0709-Add-Feature-Generation-API.patch} (100%) rename patches/server/{0711-Fix-PlayerDropItemEvent-using-wrong-item.patch => 0710-Fix-PlayerDropItemEvent-using-wrong-item.patch} (94%) rename patches/server/{0712-Deobfuscate-stacktraces-in-log-messages-crash-report.patch => 0711-Deobfuscate-stacktraces-in-log-messages-crash-report.patch} (100%) rename patches/server/{0713-Missing-Entity-Behavior-API.patch => 0712-Missing-Entity-Behavior-API.patch} (100%) rename patches/server/{0714-Ensure-disconnect-for-book-edit-is-called-on-main.patch => 0713-Ensure-disconnect-for-book-edit-is-called-on-main.patch} (92%) rename patches/server/{0715-Add-git-branch-and-commit-to-manifest.patch => 0714-Add-git-branch-and-commit-to-manifest.patch} (92%) rename patches/server/{0716-Improve-CraftChunk-getEntities.patch => 0715-Improve-CraftChunk-getEntities.patch} (100%) rename patches/server/{0717-Fix-return-value-of-Block-applyBoneMeal-always-being.patch => 0716-Fix-return-value-of-Block-applyBoneMeal-always-being.patch} (100%) rename patches/server/{0718-Use-getChunkIfLoadedImmediately-in-places.patch => 0717-Use-getChunkIfLoadedImmediately-in-places.patch} (97%) rename patches/server/{0719-Fix-commands-from-signs-not-firing-command-events.patch => 0718-Fix-commands-from-signs-not-firing-command-events.patch} (98%) rename patches/server/{0720-Adds-PlayerArmSwingEvent.patch => 0719-Adds-PlayerArmSwingEvent.patch} (100%) rename patches/server/{0721-Fixes-kick-event-leave-message-not-being-sent.patch => 0720-Fixes-kick-event-leave-message-not-being-sent.patch} (98%) rename patches/server/{0722-Add-config-for-mobs-immune-to-default-effects.patch => 0721-Add-config-for-mobs-immune-to-default-effects.patch} (96%) rename patches/server/{0723-Fix-incorrect-message-for-outdated-client.patch => 0722-Fix-incorrect-message-for-outdated-client.patch} (100%) rename patches/server/{0724-Fix-MerchantOffer-BuyB-Only-AssertionError.patch => 0723-Fix-MerchantOffer-BuyB-Only-AssertionError.patch} (100%) rename patches/server/{0725-Don-t-apply-cramming-damage-to-players.patch => 0724-Don-t-apply-cramming-damage-to-players.patch} (91%) rename patches/server/{0726-Rate-options-and-timings-for-sensors-and-behaviors.patch => 0725-Rate-options-and-timings-for-sensors-and-behaviors.patch} (99%) rename patches/server/{0727-Add-a-bunch-of-missing-forceDrop-toggles.patch => 0726-Add-a-bunch-of-missing-forceDrop-toggles.patch} (100%) rename patches/server/{0728-Stinger-API.patch => 0727-Stinger-API.patch} (100%) rename patches/server/{0729-Fix-incosistency-issue-with-empty-map-items-in-CB.patch => 0728-Fix-incosistency-issue-with-empty-map-items-in-CB.patch} (100%) rename patches/server/{0730-Add-System.out-err-catcher.patch => 0729-Add-System.out-err-catcher.patch} (100%) rename patches/server/{0731-Fix-test-not-bootstrapping.patch => 0730-Fix-test-not-bootstrapping.patch} (100%) rename patches/server/{0732-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch => 0731-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch} (100%) rename patches/server/{0733-Improve-boat-collision-performance.patch => 0732-Improve-boat-collision-performance.patch} (98%) rename patches/server/{0734-Prevent-AFK-kick-while-watching-end-credits.patch => 0733-Prevent-AFK-kick-while-watching-end-credits.patch} (93%) rename patches/server/{0735-Allow-skipping-writing-of-comments-to-server.propert.patch => 0734-Allow-skipping-writing-of-comments-to-server.propert.patch} (100%) rename patches/server/{0736-Add-PlayerSetSpawnEvent.patch => 0735-Add-PlayerSetSpawnEvent.patch} (96%) rename patches/server/{0737-Make-hoppers-respect-inventory-max-stack-size.patch => 0736-Make-hoppers-respect-inventory-max-stack-size.patch} (100%) rename patches/server/{0738-Optimize-entity-tracker-passenger-checks.patch => 0737-Optimize-entity-tracker-passenger-checks.patch} (100%) rename patches/server/{0739-Config-option-for-Piglins-guarding-chests.patch => 0738-Config-option-for-Piglins-guarding-chests.patch} (95%) rename patches/server/{0740-Added-EntityDamageItemEvent.patch => 0739-Added-EntityDamageItemEvent.patch} (100%) rename patches/server/{0741-Optimize-indirect-passenger-iteration.patch => 0740-Optimize-indirect-passenger-iteration.patch} (100%) rename patches/server/{0742-Fix-block-drops-position-losing-precision-millions-o.patch => 0741-Fix-block-drops-position-losing-precision-millions-o.patch} (100%) rename patches/server/{0743-Configurable-item-frame-map-cursor-update-interval.patch => 0742-Configurable-item-frame-map-cursor-update-interval.patch} (96%) rename patches/server/{0744-Make-EntityUnleashEvent-cancellable.patch => 0743-Make-EntityUnleashEvent-cancellable.patch} (100%) rename patches/server/{0745-Clear-bucket-NBT-after-dispense.patch => 0744-Clear-bucket-NBT-after-dispense.patch} (100%) rename patches/server/{0746-ChunkMap.mainInvokingExecutor.patch => 0745-ChunkMap.mainInvokingExecutor.patch} (100%) rename patches/server/{0747-Do-not-fire-PlayerBucketFillEvent-when-no-fluid.patch => 0746-Do-not-fire-PlayerBucketFillEvent-when-no-fluid.patch} (100%) rename patches/server/{0748-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch => 0747-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch} (100%) rename patches/server/{0749-Respect-despawn-rate-in-item-merge-check.patch => 0748-Respect-despawn-rate-in-item-merge-check.patch} (100%) rename patches/server/{0750-Move-BlockPistonRetractEvent-to-fix-duplication.patch => 0749-Move-BlockPistonRetractEvent-to-fix-duplication.patch} (100%) rename patches/server/{0751-Change-EnderEye-target-without-changing-other-things.patch => 0750-Change-EnderEye-target-without-changing-other-things.patch} (100%) rename patches/server/{0752-Fix-bed-handling-for-custom-dimensions.patch => 0751-Fix-bed-handling-for-custom-dimensions.patch} (100%) diff --git a/patches/server/0376-Add-debug-for-sync-chunk-loads.patch b/patches/server/0376-Add-debug-for-sync-chunk-loads.patch index 0d27d4da0b..1d84f0d3eb 100644 --- a/patches/server/0376-Add-debug-for-sync-chunk-loads.patch +++ b/patches/server/0376-Add-debug-for-sync-chunk-loads.patch @@ -7,10 +7,13 @@ This patch adds a tool to find calls to getChunkAt which would load chunks, however it must be enabled by setting the startup flag -Dpaper.debug-sync-loads=true -To get a debug log for sync loads, the command is /paper syncloadinfo +- To get a debug log for sync loads, the command is + /paper syncloadinfo +- To clear clear the currently stored sync load info, use + /paper syncloadinfo clear diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index c6254f39f98b821f75a21c0ecea457f73247385f..42583cc3a6e2631614a4b9c303b1cfa4c9ae92c6 100644 +index c6254f39f98b821f75a21c0ecea457f73247385f..30452d2cef4d296513d582f65264ae58ad7609fc 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -1,11 +1,17 @@ @@ -50,7 +53,19 @@ index c6254f39f98b821f75a21c0ecea457f73247385f..42583cc3a6e2631614a4b9c303b1cfa4 public PaperCommand(String name) { super(name); -@@ -165,6 +174,9 @@ public class PaperCommand extends Command { +@@ -90,6 +99,11 @@ public class PaperCommand extends Command { + return getListMatchingLast(sender, args, worldNames); + } + break; ++ case "syncloadinfo": ++ if (args.length == 2) { ++ return getListMatchingLast(sender, args, "clear"); ++ } ++ break; + } + return Collections.emptyList(); + } +@@ -165,6 +179,9 @@ public class PaperCommand extends Command { case "fixlight": this.doFixLight(sender, args); break; @@ -60,7 +75,7 @@ index c6254f39f98b821f75a21c0ecea457f73247385f..42583cc3a6e2631614a4b9c303b1cfa4 case "ver": if (!testPermission(sender, "version")) break; // "ver" needs a special check because it's an alias. All other commands are checked up before the switch statement (because they are present in the SUBCOMMANDS set) case "version": -@@ -182,6 +194,40 @@ public class PaperCommand extends Command { +@@ -182,6 +199,47 @@ public class PaperCommand extends Command { return true; } @@ -69,6 +84,13 @@ index c6254f39f98b821f75a21c0ecea457f73247385f..42583cc3a6e2631614a4b9c303b1cfa4 + sender.sendMessage(ChatColor.RED + "This command requires the server startup flag '-Dpaper.debug-sync-loads=true' to be set."); + return; + } ++ ++ if (args.length > 1 && args[1].equals("clear")) { ++ SyncLoadFinder.clear(); ++ sender.sendMessage(ChatColor.GRAY + "Sync load data cleared."); ++ return; ++ } ++ + File file = new File(new File(new File("."), "debug"), + "sync-load-info" + DateTimeFormatter.ofPattern("yyyy-MM-dd_HH.mm.ss").format(LocalDateTime.now()) + ".txt"); + file.getParentFile().mkdirs(); @@ -103,10 +125,10 @@ index c6254f39f98b821f75a21c0ecea457f73247385f..42583cc3a6e2631614a4b9c303b1cfa4 if (args.length < 2 || args[1].equals("*")) { diff --git a/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java b/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java new file mode 100644 -index 0000000000000000000000000000000000000000..524f33371b9de1d4dd6972fe59ffbe1804d7c5f3 +index 0000000000000000000000000000000000000000..0bb4aaa546939b67a5d22865190f30478a9337c1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java -@@ -0,0 +1,171 @@ +@@ -0,0 +1,175 @@ +package com.destroystokyo.paper.io; + +import com.google.gson.JsonArray; @@ -135,6 +157,10 @@ index 0000000000000000000000000000000000000000..524f33371b9de1d4dd6972fe59ffbe18 + public final Long2IntOpenHashMap coordinateTimes = new Long2IntOpenHashMap(); + } + ++ public static void clear() { ++ SYNC_LOADS.clear(); ++ } ++ + public static void logSyncLoad(final Level world, final int chunkX, final int chunkZ) { + if (!ENABLED) { + return; diff --git a/patches/server/0470-Paper-dumpitem-command.patch b/patches/server/0470-Paper-dumpitem-command.patch index bcaa088a34..cb4b03841b 100644 --- a/patches/server/0470-Paper-dumpitem-command.patch +++ b/patches/server/0470-Paper-dumpitem-command.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Paper dumpitem command Let's you quickly view the item in your hands NBT data diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index 42583cc3a6e2631614a4b9c303b1cfa4c9ae92c6..847ff34a56b7477996901662c25f50b79262f4e1 100644 +index 30452d2cef4d296513d582f65264ae58ad7609fc..f170dff5140d9beaaee3d987ae820b5971a8aa49 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -20,6 +20,7 @@ import net.minecraft.server.level.ServerPlayer; @@ -36,7 +36,7 @@ index 42583cc3a6e2631614a4b9c303b1cfa4c9ae92c6..847ff34a56b7477996901662c25f50b7 public PaperCommand(String name) { super(name); -@@ -165,6 +168,9 @@ public class PaperCommand extends Command { +@@ -170,6 +173,9 @@ public class PaperCommand extends Command { case "reload": doReload(sender); break; @@ -46,7 +46,7 @@ index 42583cc3a6e2631614a4b9c303b1cfa4c9ae92c6..847ff34a56b7477996901662c25f50b7 case "debug": doDebug(sender, args); break; -@@ -466,6 +472,23 @@ public class PaperCommand extends Command { +@@ -478,6 +484,23 @@ public class PaperCommand extends Command { Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Paper config reload complete."); } diff --git a/patches/server/0682-Clear-SyncLoadInfo.patch b/patches/server/0682-Clear-SyncLoadInfo.patch deleted file mode 100644 index b58770b5f0..0000000000 --- a/patches/server/0682-Clear-SyncLoadInfo.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tom -Date: Fri, 26 Feb 2021 16:10:53 -0600 -Subject: [PATCH] Clear SyncLoadInfo - -This patch merely adds the extra argument "clear" after /paper syncloadinfo to clear currently stored syncload info. - -diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index 847ff34a56b7477996901662c25f50b79262f4e1..ba8395435482fc4d6e02fc86794cdb0d35d4399c 100644 ---- a/src/main/java/com/destroystokyo/paper/PaperCommand.java -+++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java -@@ -205,6 +205,13 @@ public class PaperCommand extends Command { - sender.sendMessage(ChatColor.RED + "This command requires the server startup flag '-Dpaper.debug-sync-loads=true' to be set."); - return; - } -+ -+ if (args.length > 1 && args[1].equals("clear")) { -+ SyncLoadFinder.clear(); -+ sender.sendMessage(ChatColor.GRAY + "Sync load data cleared."); -+ return; -+ } -+ - File file = new File(new File(new File("."), "debug"), - "sync-load-info" + DateTimeFormatter.ofPattern("yyyy-MM-dd_HH.mm.ss").format(LocalDateTime.now()) + ".txt"); - file.getParentFile().mkdirs(); -diff --git a/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java b/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java -index 524f33371b9de1d4dd6972fe59ffbe1804d7c5f3..0bb4aaa546939b67a5d22865190f30478a9337c1 100644 ---- a/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java -+++ b/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java -@@ -26,6 +26,10 @@ public class SyncLoadFinder { - public final Long2IntOpenHashMap coordinateTimes = new Long2IntOpenHashMap(); - } - -+ public static void clear() { -+ SYNC_LOADS.clear(); -+ } -+ - public static void logSyncLoad(final Level world, final int chunkX, final int chunkZ) { - if (!ENABLED) { - return; diff --git a/patches/server/0683-ItemStack-repair-check-API.patch b/patches/server/0682-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0683-ItemStack-repair-check-API.patch rename to patches/server/0682-ItemStack-repair-check-API.patch diff --git a/patches/server/0684-More-Enchantment-API.patch b/patches/server/0683-More-Enchantment-API.patch similarity index 100% rename from patches/server/0684-More-Enchantment-API.patch rename to patches/server/0683-More-Enchantment-API.patch diff --git a/patches/server/0685-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0684-Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 100% rename from patches/server/0685-Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/server/0684-Add-command-line-option-to-load-extra-plugin-jars-no.patch diff --git a/patches/server/0686-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0685-Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/0686-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0685-Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/0687-Add-Mob-lookAt-API.patch b/patches/server/0686-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0687-Add-Mob-lookAt-API.patch rename to patches/server/0686-Add-Mob-lookAt-API.patch diff --git a/patches/server/0688-Add-Unix-domain-socket-support.patch b/patches/server/0687-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0688-Add-Unix-domain-socket-support.patch rename to patches/server/0687-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0689-Add-EntityInsideBlockEvent.patch b/patches/server/0688-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0689-Add-EntityInsideBlockEvent.patch rename to patches/server/0688-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0690-Attributes-API-for-item-defaults.patch b/patches/server/0689-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0690-Attributes-API-for-item-defaults.patch rename to patches/server/0689-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0691-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch b/patches/server/0690-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0691-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch rename to patches/server/0690-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch diff --git a/patches/server/0692-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0691-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 98% rename from patches/server/0692-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0691-Add-cause-to-Weather-ThunderChangeEvents.patch index 01d7305137..481530bb85 100644 --- a/patches/server/0692-Add-cause-to-Weather-ThunderChangeEvents.patch +++ b/patches/server/0691-Add-cause-to-Weather-ThunderChangeEvents.patch @@ -104,7 +104,7 @@ index cd840dc4a8ca432868fb3e9c912ea928e5303e0d..4d0af984490b556a9911c3b8fdca1e16 if (weather.isCancelled()) { return; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index b825673fdd7c8c8dd9e05fe6b317006a64ba913e..43f8dda87654387e95c18e93c0dd8126002b1fe0 100644 +index 48052de8a7a495743845f1610ed00cafb535bb89..696019dad030d6168a8794d5c5f21f94e58d9082 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1457,7 +1457,7 @@ public class CraftWorld implements World { diff --git a/patches/server/0693-More-Lidded-Block-API.patch b/patches/server/0692-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0693-More-Lidded-Block-API.patch rename to patches/server/0692-More-Lidded-Block-API.patch diff --git a/patches/server/0694-Limit-item-frame-cursors-on-maps.patch b/patches/server/0693-Limit-item-frame-cursors-on-maps.patch similarity index 95% rename from patches/server/0694-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0693-Limit-item-frame-cursors-on-maps.patch index 132dffd94f..1697c6a16e 100644 --- a/patches/server/0694-Limit-item-frame-cursors-on-maps.patch +++ b/patches/server/0693-Limit-item-frame-cursors-on-maps.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Limit item frame cursors on maps diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 3e9f288ee310c7c79664e69b99698fdd179ae77f..c0e733d839f4c86bdcd6e1ca0b40b082fc6eb86e 100644 +index d4bbb93c09d2183e5eb12d6629ed109bd2f43d76..604100365cf396165651b1731574938598507ed3 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -794,5 +794,10 @@ public class PaperWorldConfig { diff --git a/patches/server/0695-Add-PufferFishStateChangeEvent.patch b/patches/server/0694-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0695-Add-PufferFishStateChangeEvent.patch rename to patches/server/0694-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0696-Add-PlayerKickEvent-causes.patch b/patches/server/0695-Add-PlayerKickEvent-causes.patch similarity index 99% rename from patches/server/0696-Add-PlayerKickEvent-causes.patch rename to patches/server/0695-Add-PlayerKickEvent-causes.patch index 27019f47c5..f70458287a 100644 --- a/patches/server/0696-Add-PlayerKickEvent-causes.patch +++ b/patches/server/0695-Add-PlayerKickEvent-causes.patch @@ -318,7 +318,7 @@ index 6cb46508513a5ccf60dba357ff1a2911dd5e1f64..b54f151cb3001ab2070f51ea3c20a597 } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index a708080ef25bc9596fc8f2b997b534dc5787d495..047145064e95d3d9cf398e61a17bb8ea8b46a0a0 100644 +index ca80f9654eff2ab8caec089acb739e60efb66ec3..37929258810a70f65219d46457965fa333486e41 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -716,7 +716,7 @@ public abstract class PlayerList { @@ -342,7 +342,7 @@ index a708080ef25bc9596fc8f2b997b534dc5787d495..047145064e95d3d9cf398e61a17bb8ea // CraftBukkit end diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 1f631bdf64795913b0f6e5c1c4c8522f71b40dd1..ce827827b0bdec3e4928dda72393aacd2a46ba77 100644 +index 373f84ca07dead7f23b8fcc6476473cfa9164197..87529b945211067c0b280e2381284066f2925de6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -499,16 +499,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0697-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0696-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0697-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0696-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0698-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/server/0697-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch similarity index 100% rename from patches/server/0698-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch rename to patches/server/0697-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch diff --git a/patches/server/0699-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0698-Add-option-to-fix-items-merging-through-walls.patch similarity index 96% rename from patches/server/0699-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0698-Add-option-to-fix-items-merging-through-walls.patch index 1bcabc4f4a..c111cb14f8 100644 --- a/patches/server/0699-Add-option-to-fix-items-merging-through-walls.patch +++ b/patches/server/0698-Add-option-to-fix-items-merging-through-walls.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add option to fix items merging through walls diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index c0e733d839f4c86bdcd6e1ca0b40b082fc6eb86e..579bd433e1f680c2273cd048b304c1276016e6cc 100644 +index 604100365cf396165651b1731574938598507ed3..c6b7133a5ac742e402f617acbf4ba351539123d1 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -799,5 +799,10 @@ public class PaperWorldConfig { diff --git a/patches/server/0700-Add-BellRevealRaiderEvent.patch b/patches/server/0699-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0700-Add-BellRevealRaiderEvent.patch rename to patches/server/0699-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0701-Fix-invulnerable-end-crystals.patch b/patches/server/0700-Fix-invulnerable-end-crystals.patch similarity index 98% rename from patches/server/0701-Fix-invulnerable-end-crystals.patch rename to patches/server/0700-Fix-invulnerable-end-crystals.patch index bb20a05f39..10f45e2bd3 100644 --- a/patches/server/0701-Fix-invulnerable-end-crystals.patch +++ b/patches/server/0700-Fix-invulnerable-end-crystals.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix invulnerable end crystals MC-108513 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 579bd433e1f680c2273cd048b304c1276016e6cc..97a1ca789eb606b263ebabad188baefe4df69b85 100644 +index c6b7133a5ac742e402f617acbf4ba351539123d1..d8c45d689aeb1c5193d71b8f9b7ea85ae78a4206 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -804,5 +804,10 @@ public class PaperWorldConfig { diff --git a/patches/server/0702-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0701-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0702-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0701-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0703-Fix-dangerous-end-portal-logic.patch b/patches/server/0702-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0703-Fix-dangerous-end-portal-logic.patch rename to patches/server/0702-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0704-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0703-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0704-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0703-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0705-Make-item-validations-configurable.patch b/patches/server/0704-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0705-Make-item-validations-configurable.patch rename to patches/server/0704-Make-item-validations-configurable.patch diff --git a/patches/server/0706-Line-Of-Sight-Changes.patch b/patches/server/0705-Line-Of-Sight-Changes.patch similarity index 95% rename from patches/server/0706-Line-Of-Sight-Changes.patch rename to patches/server/0705-Line-Of-Sight-Changes.patch index 5a34c4959a..6a12efa4cf 100644 --- a/patches/server/0706-Line-Of-Sight-Changes.patch +++ b/patches/server/0705-Line-Of-Sight-Changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Line Of Sight Changes diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index deade89dbbd1d4e548be7be1a46e36b7a9eff809..8443d1531cf361509abfacff296ce277e35c6b13 100644 +index 6539cd1a63f2d987bda2b91555b94df896089d1f..429c229d7c88060c76b143ff4aa1bea88b2be786 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3430,7 +3430,8 @@ public abstract class LivingEntity extends Entity { @@ -19,7 +19,7 @@ index deade89dbbd1d4e548be7be1a46e36b7a9eff809..8443d1531cf361509abfacff296ce277 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 43f8dda87654387e95c18e93c0dd8126002b1fe0..54d4c7aaae20fd8792004bee0f370ac3c629c973 100644 +index 696019dad030d6168a8794d5c5f21f94e58d9082..6f0334f5162087eff0c64c9bdd47ff6b34a481b7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -331,6 +331,18 @@ public class CraftWorld implements World { diff --git a/patches/server/0707-add-per-world-spawn-limits.patch b/patches/server/0706-add-per-world-spawn-limits.patch similarity index 92% rename from patches/server/0707-add-per-world-spawn-limits.patch rename to patches/server/0706-add-per-world-spawn-limits.patch index 93b7b97d5d..dbaccb684d 100644 --- a/patches/server/0707-add-per-world-spawn-limits.patch +++ b/patches/server/0706-add-per-world-spawn-limits.patch @@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits Taken from #2982. Credit to Chasewhip8 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 97a1ca789eb606b263ebabad188baefe4df69b85..435558eb9f3ce277c14ff5e368d489d1df4da8e1 100644 +index d8c45d689aeb1c5193d71b8f9b7ea85ae78a4206..dbace53ecb13cf372c8ad0dce2af7dcfe16e86d4 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -660,6 +660,19 @@ public class PaperWorldConfig { @@ -30,7 +30,7 @@ index 97a1ca789eb606b263ebabad188baefe4df69b85..435558eb9f3ce277c14ff5e368d489d1 private void lightQueueSize() { lightQueueSize = getInt("light-queue-size", lightQueueSize); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 54d4c7aaae20fd8792004bee0f370ac3c629c973..8a1bee6a664b8c05b0c2f633d0971cfce5dacad2 100644 +index 6f0334f5162087eff0c64c9bdd47ff6b34a481b7..9d7fc426710183f12f5a8606bef459040d4b33bc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -352,6 +352,13 @@ public class CraftWorld implements World { diff --git a/patches/server/0708-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0707-Fix-PotionSplashEvent-for-water-splash-potions.patch similarity index 100% rename from patches/server/0708-Fix-PotionSplashEvent-for-water-splash-potions.patch rename to patches/server/0707-Fix-PotionSplashEvent-for-water-splash-potions.patch diff --git a/patches/server/0709-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch b/patches/server/0708-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch similarity index 100% rename from patches/server/0709-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch rename to patches/server/0708-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch diff --git a/patches/server/0710-Add-Feature-Generation-API.patch b/patches/server/0709-Add-Feature-Generation-API.patch similarity index 100% rename from patches/server/0710-Add-Feature-Generation-API.patch rename to patches/server/0709-Add-Feature-Generation-API.patch diff --git a/patches/server/0711-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0710-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 94% rename from patches/server/0711-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0710-Fix-PlayerDropItemEvent-using-wrong-item.patch index c8fd335ad4..a2ca778049 100644 --- a/patches/server/0711-Fix-PlayerDropItemEvent-using-wrong-item.patch +++ b/patches/server/0710-Fix-PlayerDropItemEvent-using-wrong-item.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix PlayerDropItemEvent using wrong item diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 592b2a22f5f971f4445c9b336d04923ba74a64b2..c0cb54711b7cf3bb134b4940202280525b407459 100644 +index e426942d85cfff429e9dd3bb8f9ef6dc88524778..30b430e9c0fe9782a94ac93c02ea28095e762dc7 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2139,7 +2139,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0712-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0711-Deobfuscate-stacktraces-in-log-messages-crash-report.patch similarity index 100% rename from patches/server/0712-Deobfuscate-stacktraces-in-log-messages-crash-report.patch rename to patches/server/0711-Deobfuscate-stacktraces-in-log-messages-crash-report.patch diff --git a/patches/server/0713-Missing-Entity-Behavior-API.patch b/patches/server/0712-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/server/0713-Missing-Entity-Behavior-API.patch rename to patches/server/0712-Missing-Entity-Behavior-API.patch diff --git a/patches/server/0714-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0713-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 92% rename from patches/server/0714-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0713-Ensure-disconnect-for-book-edit-is-called-on-main.patch index da35abd835..e2f4efdfac 100644 --- a/patches/server/0714-Ensure-disconnect-for-book-edit-is-called-on-main.patch +++ b/patches/server/0713-Ensure-disconnect-for-book-edit-is-called-on-main.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 721d9d2fd93001089ea31ca8fb47cf071ee6a7b0..1266e6a05c4e581eed53ee1abdcc6f089d832d50 100644 +index b54f151cb3001ab2070f51ea3c20a597caaa8ff0..ffe9486b6634149532ee802e17683eda302041b3 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1093,7 +1093,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0715-Add-git-branch-and-commit-to-manifest.patch b/patches/server/0714-Add-git-branch-and-commit-to-manifest.patch similarity index 92% rename from patches/server/0715-Add-git-branch-and-commit-to-manifest.patch rename to patches/server/0714-Add-git-branch-and-commit-to-manifest.patch index 31be099dd4..058e20bb33 100644 --- a/patches/server/0715-Add-git-branch-and-commit-to-manifest.patch +++ b/patches/server/0714-Add-git-branch-and-commit-to-manifest.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add git branch and commit to manifest diff --git a/build.gradle.kts b/build.gradle.kts -index 0311fb1e70eb52da19685f7d9d815daf8f3a83ab..3927eb2cd13499bca7561ae7d9be45ae86522125 100644 +index dc17410ac88e9f069a48ce7eb94b7cbec8e61c74..1876481a830228fd15fcd2a4be5f2c28bd7e51fe 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -76,6 +76,7 @@ tasks.jar { diff --git a/patches/server/0716-Improve-CraftChunk-getEntities.patch b/patches/server/0715-Improve-CraftChunk-getEntities.patch similarity index 100% rename from patches/server/0716-Improve-CraftChunk-getEntities.patch rename to patches/server/0715-Improve-CraftChunk-getEntities.patch diff --git a/patches/server/0717-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0716-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0717-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0716-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0718-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0717-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 97% rename from patches/server/0718-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0717-Use-getChunkIfLoadedImmediately-in-places.patch index d66c4fdfe7..f2eaa82a5d 100644 --- a/patches/server/0718-Use-getChunkIfLoadedImmediately-in-places.patch +++ b/patches/server/0717-Use-getChunkIfLoadedImmediately-in-places.patch @@ -21,7 +21,7 @@ index 9da2c0e52618afbfcaf5f7851fa0a5f85f0a12f3..baa25df9f446c8edea9666983425df31 // Paper start - Asynchronous IO diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1266e6a05c4e581eed53ee1abdcc6f089d832d50..8227769f21a0a8589e777c2bb12dd7de7ed37282 100644 +index ffe9486b6634149532ee802e17683eda302041b3..d3cbcaaecd4fd33bbda8115a9fa7ff7fb743fd6b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1298,7 +1298,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0719-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0718-Fix-commands-from-signs-not-firing-command-events.patch similarity index 98% rename from patches/server/0719-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0718-Fix-commands-from-signs-not-firing-command-events.patch index 38c803317f..53ab75dba5 100644 --- a/patches/server/0719-Fix-commands-from-signs-not-firing-command-events.patch +++ b/patches/server/0718-Fix-commands-from-signs-not-firing-command-events.patch @@ -10,7 +10,7 @@ This patch changes sign command logic so that `run_command` click events: - sends failure messages to the player who clicked the sign diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 435558eb9f3ce277c14ff5e368d489d1df4da8e1..b8a2406d847051442485691c91dcd82d40258424 100644 +index dbace53ecb13cf372c8ad0dce2af7dcfe16e86d4..8b5f6b1c68fb1b4e945233aa8460d64a09642bc7 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -822,5 +822,10 @@ public class PaperWorldConfig { diff --git a/patches/server/0720-Adds-PlayerArmSwingEvent.patch b/patches/server/0719-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/0720-Adds-PlayerArmSwingEvent.patch rename to patches/server/0719-Adds-PlayerArmSwingEvent.patch diff --git a/patches/server/0721-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0720-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 98% rename from patches/server/0721-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0720-Fixes-kick-event-leave-message-not-being-sent.patch index 8c55a6a817..be28e1a420 100644 --- a/patches/server/0721-Fixes-kick-event-leave-message-not-being-sent.patch +++ b/patches/server/0720-Fixes-kick-event-leave-message-not-being-sent.patch @@ -39,7 +39,7 @@ index 5fe5a9cf5d39ab0cce0b427385016496f858dfbd..4bc7ad298f899b093ebe84bee276bdac this.server.getPlayerList().broadcastMessage(PaperAdventure.asVanilla(quitMessage), ChatType.SYSTEM, Util.NIL_UUID); // Paper end diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 047145064e95d3d9cf398e61a17bb8ea8b46a0a0..f2e5b5c1862dd650dc34dcaead68e5ffca0882d4 100644 +index 37929258810a70f65219d46457965fa333486e41..2163cd133dd37d8aafb46765927bbfac6c40a809 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -587,6 +587,11 @@ public abstract class PlayerList { diff --git a/patches/server/0722-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0721-Add-config-for-mobs-immune-to-default-effects.patch similarity index 96% rename from patches/server/0722-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0721-Add-config-for-mobs-immune-to-default-effects.patch index f30902fbec..0ac3284e47 100644 --- a/patches/server/0722-Add-config-for-mobs-immune-to-default-effects.patch +++ b/patches/server/0721-Add-config-for-mobs-immune-to-default-effects.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config for mobs immune to default effects diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index b8a2406d847051442485691c91dcd82d40258424..6ff53e138ea17c3e8283a52251c81d5cdf91ebac 100644 +index 8b5f6b1c68fb1b4e945233aa8460d64a09642bc7..899fbd4e60ccab353e6e2b2ae2ddbe94f43255d0 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -650,6 +650,21 @@ public class PaperWorldConfig { @@ -31,7 +31,7 @@ index b8a2406d847051442485691c91dcd82d40258424..6ff53e138ea17c3e8283a52251c81d5c private void nerfNetherPortalPigmen() { nerfNetherPortalPigmen = getBoolean("game-mechanics.nerf-pigmen-from-nether-portals", nerfNetherPortalPigmen); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 8443d1531cf361509abfacff296ce277e35c6b13..5126c1440e0f3354dbcaa05d24a4b81e044473cd 100644 +index 429c229d7c88060c76b143ff4aa1bea88b2be786..2c49851c2113692d666ccdde6043c82370725010 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1133,7 +1133,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0723-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0722-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0723-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0722-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0724-Fix-MerchantOffer-BuyB-Only-AssertionError.patch b/patches/server/0723-Fix-MerchantOffer-BuyB-Only-AssertionError.patch similarity index 100% rename from patches/server/0724-Fix-MerchantOffer-BuyB-Only-AssertionError.patch rename to patches/server/0723-Fix-MerchantOffer-BuyB-Only-AssertionError.patch diff --git a/patches/server/0725-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0724-Don-t-apply-cramming-damage-to-players.patch similarity index 91% rename from patches/server/0725-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0724-Don-t-apply-cramming-damage-to-players.patch index 784fb24168..c78196dcf0 100644 --- a/patches/server/0725-Don-t-apply-cramming-damage-to-players.patch +++ b/patches/server/0724-Don-t-apply-cramming-damage-to-players.patch @@ -11,7 +11,7 @@ It does not make a lot of sense to damage players if they get crammed, For those who really want it a config option is provided. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 6ff53e138ea17c3e8283a52251c81d5cdf91ebac..0e7d29dbbdb862dd5876adee26fbba02267e5276 100644 +index 899fbd4e60ccab353e6e2b2ae2ddbe94f43255d0..6ad258d211277e671b0b15f06bcc60673c04017b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -842,5 +842,10 @@ public class PaperWorldConfig { @@ -26,7 +26,7 @@ index 6ff53e138ea17c3e8283a52251c81d5cdf91ebac..0e7d29dbbdb862dd5876adee26fbba02 } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c0cb54711b7cf3bb134b4940202280525b407459..926ae5fdfc8c99f4822c4d4255fd53c2999135f4 100644 +index 30b430e9c0fe9782a94ac93c02ea28095e762dc7..be4105a85100757231c6bc94a0b0684e68110754 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1397,7 +1397,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0726-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0725-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 99% rename from patches/server/0726-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0725-Rate-options-and-timings-for-sensors-and-behaviors.patch index 12708e0626..12dd6ca544 100644 --- a/patches/server/0726-Rate-options-and-timings-for-sensors-and-behaviors.patch +++ b/patches/server/0725-Rate-options-and-timings-for-sensors-and-behaviors.patch @@ -28,7 +28,7 @@ index b9cdbf8acccfd6b207a0116f068168f3b8c8e17d..8c883d2f88acc731734a121ebb76821e * Get a named timer for the specified tile entity type to track type specific timings. * @param entity diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 0e7d29dbbdb862dd5876adee26fbba02267e5276..c334f29c69c1e6e3fe55cd6695e7df400cf36058 100644 +index 6ad258d211277e671b0b15f06bcc60673c04017b..ea397cd57ccbf7efc4f31d532cd6dfdccfcee8d8 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -3,14 +3,19 @@ package com.destroystokyo.paper; diff --git a/patches/server/0727-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0726-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0727-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0726-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0728-Stinger-API.patch b/patches/server/0727-Stinger-API.patch similarity index 100% rename from patches/server/0728-Stinger-API.patch rename to patches/server/0727-Stinger-API.patch diff --git a/patches/server/0729-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0728-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0729-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0728-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0730-Add-System.out-err-catcher.patch b/patches/server/0729-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0730-Add-System.out-err-catcher.patch rename to patches/server/0729-Add-System.out-err-catcher.patch diff --git a/patches/server/0731-Fix-test-not-bootstrapping.patch b/patches/server/0730-Fix-test-not-bootstrapping.patch similarity index 100% rename from patches/server/0731-Fix-test-not-bootstrapping.patch rename to patches/server/0730-Fix-test-not-bootstrapping.patch diff --git a/patches/server/0732-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0731-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0732-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0731-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0733-Improve-boat-collision-performance.patch b/patches/server/0732-Improve-boat-collision-performance.patch similarity index 98% rename from patches/server/0733-Improve-boat-collision-performance.patch rename to patches/server/0732-Improve-boat-collision-performance.patch index 428ea74ec3..6d28994550 100644 --- a/patches/server/0733-Improve-boat-collision-performance.patch +++ b/patches/server/0732-Improve-boat-collision-performance.patch @@ -17,7 +17,7 @@ index 81f4f26a6b83079d36acd1fd86dede0eb1116c01..59437f04911662f06596ef61b91017ca public static Collector, ?, Map> toMap() { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 5126c1440e0f3354dbcaa05d24a4b81e044473cd..b2e48e16bc944e6c5898f3d415e935c421243e16 100644 +index 2c49851c2113692d666ccdde6043c82370725010..6175360eb2b19c8197cc5b82a09030211afd838b 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1321,7 +1321,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0734-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0733-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 93% rename from patches/server/0734-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0733-Prevent-AFK-kick-while-watching-end-credits.patch index 5d52d3da99..b09b7f0537 100644 --- a/patches/server/0734-Prevent-AFK-kick-while-watching-end-credits.patch +++ b/patches/server/0733-Prevent-AFK-kick-while-watching-end-credits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 512e072268ed5eab2d154c38c3c2f7eca93dba77..a8be4f62bb1117a2e47d021d340f4210d5c2ae16 100644 +index 4bc7ad298f899b093ebe84bee276bdac5b7d5a76..62f2a09adefc6a90089bf5edd19b7e69a78e696e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -389,7 +389,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0735-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0734-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0735-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0734-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0736-Add-PlayerSetSpawnEvent.patch b/patches/server/0735-Add-PlayerSetSpawnEvent.patch similarity index 96% rename from patches/server/0736-Add-PlayerSetSpawnEvent.patch rename to patches/server/0735-Add-PlayerSetSpawnEvent.patch index 01a415b1e6..931c6026c4 100644 --- a/patches/server/0736-Add-PlayerSetSpawnEvent.patch +++ b/patches/server/0735-Add-PlayerSetSpawnEvent.patch @@ -18,7 +18,7 @@ index e95f2222814e104bf9194a96385737dffe2cb2b5..249ab7357aa19d87179fa4c3ae89d9d3 String string = resourceKey.location().toString(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 926ae5fdfc8c99f4822c4d4255fd53c2999135f4..c4c7399bb490f891bc83f5ba46132abaec20ec02 100644 +index be4105a85100757231c6bc94a0b0684e68110754..065589d43d411d1bde9f91594bfe7cdc6ff210a0 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1238,7 +1238,7 @@ public class ServerPlayer extends Player { @@ -67,7 +67,7 @@ index 926ae5fdfc8c99f4822c4d4255fd53c2999135f4..c4c7399bb490f891bc83f5ba46132aba this.respawnPosition = pos; diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index f2e5b5c1862dd650dc34dcaead68e5ffca0882d4..4a006309de32e463a454e400d7dd04caccf4001f 100644 +index 2163cd133dd37d8aafb46765927bbfac6c40a809..6d057d6969cd1abff3da5967b9db5a830209b206 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -892,7 +892,7 @@ public abstract class PlayerList { @@ -93,7 +93,7 @@ index af4eb4a8814491afef449a2874521636957d7557..0a5d563700c9f806139001181f01fa9d return InteractionResult.SUCCESS; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ce827827b0bdec3e4928dda72393aacd2a46ba77..bd7d5d8c03fdb836504ad733f137cb180aa1b029 100644 +index 87529b945211067c0b280e2381284066f2925de6..2eb934cc29f9dc42036f465ed6a6dbf2e5baadef 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1065,9 +1065,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0737-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0736-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0737-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0736-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0738-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0737-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0738-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0737-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0739-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0738-Config-option-for-Piglins-guarding-chests.patch similarity index 95% rename from patches/server/0739-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0738-Config-option-for-Piglins-guarding-chests.patch index 98c9015bac..6b2fe6842a 100644 --- a/patches/server/0739-Config-option-for-Piglins-guarding-chests.patch +++ b/patches/server/0738-Config-option-for-Piglins-guarding-chests.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config option for Piglins guarding chests diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index c334f29c69c1e6e3fe55cd6695e7df400cf36058..cad6b4479ad3ab9e2e4bb3a733a66e4a2598dc90 100644 +index ea397cd57ccbf7efc4f31d532cd6dfdccfcee8d8..0f91fbf2ae9735943d3214e8d26c1951cf0b5160 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -54,6 +54,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0740-Added-EntityDamageItemEvent.patch b/patches/server/0739-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0740-Added-EntityDamageItemEvent.patch rename to patches/server/0739-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0741-Optimize-indirect-passenger-iteration.patch b/patches/server/0740-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0741-Optimize-indirect-passenger-iteration.patch rename to patches/server/0740-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0742-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0741-Fix-block-drops-position-losing-precision-millions-o.patch similarity index 100% rename from patches/server/0742-Fix-block-drops-position-losing-precision-millions-o.patch rename to patches/server/0741-Fix-block-drops-position-losing-precision-millions-o.patch diff --git a/patches/server/0743-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0742-Configurable-item-frame-map-cursor-update-interval.patch similarity index 96% rename from patches/server/0743-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0742-Configurable-item-frame-map-cursor-update-interval.patch index d0d4cd9002..d4cb9db062 100644 --- a/patches/server/0743-Configurable-item-frame-map-cursor-update-interval.patch +++ b/patches/server/0742-Configurable-item-frame-map-cursor-update-interval.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable item frame map cursor update interval diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index cad6b4479ad3ab9e2e4bb3a733a66e4a2598dc90..af06e87191b2a04dc8e7c7555ab98bef17021b9f 100644 +index 0f91fbf2ae9735943d3214e8d26c1951cf0b5160..261633687b5dd55559b2ddb305c3a21a8b308ada 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -838,6 +838,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0744-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0743-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0744-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0743-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0745-Clear-bucket-NBT-after-dispense.patch b/patches/server/0744-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0745-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0744-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0746-ChunkMap.mainInvokingExecutor.patch b/patches/server/0745-ChunkMap.mainInvokingExecutor.patch similarity index 100% rename from patches/server/0746-ChunkMap.mainInvokingExecutor.patch rename to patches/server/0745-ChunkMap.mainInvokingExecutor.patch diff --git a/patches/server/0747-Do-not-fire-PlayerBucketFillEvent-when-no-fluid.patch b/patches/server/0746-Do-not-fire-PlayerBucketFillEvent-when-no-fluid.patch similarity index 100% rename from patches/server/0747-Do-not-fire-PlayerBucketFillEvent-when-no-fluid.patch rename to patches/server/0746-Do-not-fire-PlayerBucketFillEvent-when-no-fluid.patch diff --git a/patches/server/0748-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch b/patches/server/0747-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch similarity index 100% rename from patches/server/0748-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch rename to patches/server/0747-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch diff --git a/patches/server/0749-Respect-despawn-rate-in-item-merge-check.patch b/patches/server/0748-Respect-despawn-rate-in-item-merge-check.patch similarity index 100% rename from patches/server/0749-Respect-despawn-rate-in-item-merge-check.patch rename to patches/server/0748-Respect-despawn-rate-in-item-merge-check.patch diff --git a/patches/server/0750-Move-BlockPistonRetractEvent-to-fix-duplication.patch b/patches/server/0749-Move-BlockPistonRetractEvent-to-fix-duplication.patch similarity index 100% rename from patches/server/0750-Move-BlockPistonRetractEvent-to-fix-duplication.patch rename to patches/server/0749-Move-BlockPistonRetractEvent-to-fix-duplication.patch diff --git a/patches/server/0751-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0750-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0751-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0750-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0752-Fix-bed-handling-for-custom-dimensions.patch b/patches/server/0751-Fix-bed-handling-for-custom-dimensions.patch similarity index 100% rename from patches/server/0752-Fix-bed-handling-for-custom-dimensions.patch rename to patches/server/0751-Fix-bed-handling-for-custom-dimensions.patch