Squash "Clear SyncLoadInfo" into "Add debug for sync chunk loads" and add tab completion for the clear argument (#6483)

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;

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.");
      }

patches/server/0682-Clear-SyncLoadInfo.patch

@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tom <cryptite@gmail.com>
-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;

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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

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 {

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

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 {

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 {

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 {

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 {

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;

patches/server/0732-Improve-boat-collision-performance.patch

@@ -17,7 +17,7 @@ index 81f4f26a6b83079d36acd1fd86dede0eb1116c01..59437f04911662f06596ef61b91017ca
  
      public static <K, V> Collector<Entry<? extends K, ? extends V>, ?, Map<K, V>> 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 {

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

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 {

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 {

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 {