Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
2c6b1f048 Revert "Remove itneract event from boat" (Fixes #5677)
aae1c54a9 Add command line option to load extra plugin jars not in the plugins folder
322886c86 Avoid NPE due to PlayerBedFailEnterEvent
d3c9a195c removed duplicate ProjectileHitEvent for fireball (#5671)
7989028a5 More Enchantment API (#5588)
c0cb5c129 Adds methods for checking item repairability (#5651)
22399b07f Actually use extended/ambient in BeaconEffectEvent (#5647)
979135878 Add cause and cancel message to PlayerGameModeChangeEvent (#5638)
51e1e58d2 Fix Adventure support in UnknownCommandEvent (#5664)
45e19ffb0 [Auto] Updated Upstream (CraftBukkit)
151457628 Fix Counter#decrement recursive call (#5665)
21ac7dc98 [Auto] Updated Upstream (CraftBukkit)
18ad2c9dd Add environment variable (PAPER_DISABLE_SERVER_GUI) to disable server gui

patches/api/0019-ItemStack-convenience-methods.patch

@@ -50,7 +50,7 @@ index 9b1c9e60dba9ea3ef8d8e164f13dd76daf57db8e..b04e9de7183f00a9a47c1fce26895c83
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index fccfae41f53a175e1a6a670c793e464456de6b60..54af7fb0b5eaeffc7ec05dd58028bf927f71bb9e 100644
+index 0f8c593ae9bca46081f0b22c2d763a2699175398..ff17e3165beedee235c738ebc8e9c9f1a7ab52ca 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -17,6 +17,18 @@ import org.bukkit.inventory.meta.ItemMeta;
@@ -72,8 +72,8 @@ index fccfae41f53a175e1a6a670c793e464456de6b60..54af7fb0b5eaeffc7ec05dd58028bf92
  
  /**
   * Represents a stack of items.
-@@ -874,4 +886,626 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
+@@ -896,4 +908,626 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
-         return Bukkit.getUnsafe().getItemStackRarity(this);
+         return Bukkit.getUnsafe().isValidRepairItemStack(toBeRepaired, this);
      }
      // Paper end
 +

patches/api/0033-Fix-javadoc-warnings-missing-param-and-return.patch

@@ -534,7 +534,7 @@ index f546e3422539d91f1fcb98c94a722c4b17ef0170..a126581c74da8fae4c86fde2f28a8501
  
          @NotNull
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 6dbd520182b1e7713a68baad09b7f613424ef619..14244cc7f11035c4da4613bbdf49dac51f0da3cf 100644
+index e504567cf755557be8511f2c93c171572b78e722..d3c4da380e46db0cd7664b568781d03455447700 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -87,6 +87,8 @@ public interface UnsafeValues {

patches/api/0038-Add-unsafe-Entity-serialization-API.patch

@@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 14244cc7f11035c4da4613bbdf49dac51f0da3cf..7899609b7a3041477d5240deaeee9b80159c2db3 100644
+index d3c4da380e46db0cd7664b568781d03455447700..90e8c2d3f2592505d2fe96b038fae9c96d1d7911 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -172,4 +172,28 @@ public interface UnsafeValues {
+@@ -182,4 +182,28 @@ public interface UnsafeValues {
       */
      int getProtocolVersion();
      // Paper end

patches/server/0001-Tuinity-Server-Changes.patch

@@ -10935,7 +10935,7 @@ index 1d72af9cace7aa8f1d20c7c1c5be621f533e2dad..b7399d17dd64ca8b1f1fab405cb0ac91
              worldData.addProperty("keep-spawn-loaded-range", world.paperConfig.keepLoadedRange);
              worldData.addProperty("visible-chunk-count", visibleChunks.size());
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 35bb4d0b9ed131e6570cce0b43ae78c5557a0bff..8adbb9a77ff304f14ad3defa0f4f7ec25b0d2a2a 100644
+index d69ddb0236c8553cf63c4a007dfa7b87e8f58299..38547858a415ac36d6c04070d27933a6552b1612 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -268,6 +268,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -12072,7 +12072,7 @@ index c5e54c519e1f686761faa53b5e9579c514a65332..fe040615ff03478a20cdf8376f89a6b7
          try {
              boolean execChunkTask = com.destroystokyo.paper.io.chunk.ChunkTaskManager.pollChunkWaitQueue() || ChunkProviderServer.this.world.asyncChunkTaskManager.pollNextChunkTask(); // Paper
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 8683d6ddc5d8ce4a302fa6e2665b7dcd64f6a00a..aea8d85aa087d896ea93f944b8d3403ea90c9bf4 100644
+index 558af73ac16550ee6964c4dce681a404633b2552..32e400632ec1e61374f772c6262580f84a5b2288 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -262,7 +262,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -12102,7 +12102,7 @@ index 8683d6ddc5d8ce4a302fa6e2665b7dcd64f6a00a..aea8d85aa087d896ea93f944b8d3403e
                  this.setPosition(this.locX(), this.locY() + 1.0D, this.locZ());
              }
          }
-@@ -662,6 +662,185 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -671,6 +671,185 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
                  }
              }
  
@@ -12288,7 +12288,7 @@ index 8683d6ddc5d8ce4a302fa6e2665b7dcd64f6a00a..aea8d85aa087d896ea93f944b8d3403e
              if (this.getHealth() != this.lastHealthSent || this.lastFoodSent != this.foodData.getFoodLevel() || this.foodData.getSaturationLevel() == 0.0F != this.lastSentSaturationZero) {
                  this.playerConnection.sendPacket(new PacketPlayOutUpdateHealth(this.getBukkitEntity().getScaledHealth(), this.foodData.getFoodLevel(), this.foodData.getSaturationLevel())); // CraftBukkit
                  this.lastHealthSent = this.getHealth();
-@@ -1554,6 +1733,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1563,6 +1742,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          this.playerConnection.sendPacket(new PacketPlayOutCloseWindow(this.activeContainer.windowId));
          this.o();
      }
@@ -15021,7 +15021,7 @@ index f54af7cabc6b4e062948dc97e577e7fe04b5add4..4e28b58731c7e76a727ed8f0967150f8
              throw new IllegalStateException("Protocol error", cryptographyexception);
          }
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 8c9e97bb093c0e6297397edc71d72deebbcfbed9..e0c606bb6ecf23f2118a65775c05b437a09826d3 100644
+index fdc824c7b4e9aae29a8ea08a492fbdeb6519ca60..a4f7e57283950074005869e0098fe665e85286ca 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -542,6 +542,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -20718,10 +20718,10 @@ index e50731723d266ba65b2163df2e935afb8b013a93..a6736d15282715d920bab85eb92074cd
                  }
                  value.append("},");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index edeb3e542c2e32379a5fb4229b389ad4a4987dbb..5178a8b65c18bf099cad544ea7088d2eb6e1985d 100644
+index c51e9b50323f5e33bad5fd25d74c572241377059..d02b8d4b7883f235894550514a6abae81651af82 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -233,7 +233,7 @@ import javax.annotation.Nullable; // Paper
+@@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
@@ -20730,7 +20730,7 @@ index edeb3e542c2e32379a5fb4229b389ad4a4987dbb..5178a8b65c18bf099cad544ea7088d2e
      private final String serverVersion;
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
-@@ -867,6 +867,7 @@ public final class CraftServer implements Server {
+@@ -881,6 +881,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
@@ -20738,7 +20738,7 @@ index edeb3e542c2e32379a5fb4229b389ad4a4987dbb..5178a8b65c18bf099cad544ea7088d2e
          for (WorldServer world : console.getWorlds()) {
              world.worldDataServer.setDifficulty(config.difficulty);
              world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
-@@ -901,6 +902,7 @@ public final class CraftServer implements Server {
+@@ -915,6 +916,7 @@ public final class CraftServer implements Server {
              }
              world.spigotConfig.init(); // Spigot
              world.paperConfig.init(); // Paper
@@ -20746,7 +20746,7 @@ index edeb3e542c2e32379a5fb4229b389ad4a4987dbb..5178a8b65c18bf099cad544ea7088d2e
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -1920,7 +1922,10 @@ public final class CraftServer implements Server {
+@@ -1932,7 +1934,10 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean isPrimaryThread() {
@@ -20758,7 +20758,7 @@ index edeb3e542c2e32379a5fb4229b389ad4a4987dbb..5178a8b65c18bf099cad544ea7088d2e
      }
  
      // Paper start
-@@ -2354,6 +2359,14 @@ public final class CraftServer implements Server {
+@@ -2366,6 +2371,14 @@ public final class CraftServer implements Server {
              return com.destroystokyo.paper.PaperConfig.config;
          }
  
@@ -20937,7 +20937,7 @@ index 3b3eda95c0ff8b129adedbae6561bba2d01c2f3a..02807cc1fe14e747a7c18edf0fcdc386
      // Spigot start
      private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 68229f7679f9e974dc7af6c34d6f1d3f8db49353..86c7b5de4cc9f02365f0986a0e9b381f5edf395b 100644
+index 409fbeeb66fb8f58a72d94686bc9515299927b75..57180e164ac51b1aac070c00d820792d13d67258 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -146,6 +146,13 @@ public class Main {
@@ -20954,7 +20954,7 @@ index 68229f7679f9e974dc7af6c34d6f1d3f8db49353..86c7b5de4cc9f02365f0986a0e9b381f
  
                  // Paper start
                  acceptsAll(asList("server-name"), "Name of the server")
-@@ -259,7 +266,7 @@ public class Main {
+@@ -265,7 +272,7 @@ public class Main {
                      if (buildDate.before(deadline.getTime())) {
                          // Paper start - This is some stupid bullshit
                          System.err.println("*** Warning, you've not updated in a while! ***");
@@ -21023,7 +21023,7 @@ index 295ffab08672d77d88aca368cb5b56f80bc4f1b5..dee4d12a49468d38f077784b219199f0
      @Override
      public boolean teleport(Location location) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 05248f560d643080a3eac581c01aa89fb3709e6c..6f179a6c80b6b9ef90b01a987735364ec3f35602 100644
+index 34395248e3daea47178cb40aad53680fbce73600..f82fb89e30e30681b2052d1c6a2f24428d6fbfc7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2260,15 +2260,70 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0002-Airplane-Server-Changes.patch

@@ -1648,7 +1648,7 @@ index 7918d830a4aef09c9f517284e83a9376299116ad..0a40df2151bd388b6633a6f50b14f1f4
          return enumdirection;
      }));
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8adbb9a77ff304f14ad3defa0f4f7ec25b0d2a2a..dd0daf3138a38d0c8a399e6cb54bbc58af47f710 100644
+index 38547858a415ac36d6c04070d27933a6552b1612..073df4e4e21b7a57e8d4159e2c5d68bda11e3d51 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1647,7 +1647,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -3251,10 +3251,10 @@ index dcb3e4b0cf34699ed77208f8122710bbdfa3d063..a51b47892c726f4b4b10d870991e9b85
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5178a8b65c18bf099cad544ea7088d2eb6e1985d..8255e88e18080028966e084b1fd896c084398aad 100644
+index d02b8d4b7883f235894550514a6abae81651af82..3549abdc88f2708e6ccea3f152ae37770bfe951b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -233,7 +233,7 @@ import javax.annotation.Nullable; // Paper
+@@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
@@ -3263,7 +3263,7 @@ index 5178a8b65c18bf099cad544ea7088d2eb6e1985d..8255e88e18080028966e084b1fd896c0
      private final String serverVersion;
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
-@@ -981,6 +981,11 @@ public final class CraftServer implements Server {
+@@ -995,6 +995,11 @@ public final class CraftServer implements Server {
                  plugin.getDescription().getName(),
                  "This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
              ));

patches/server/0003-Rebrand.patch

@@ -92,7 +92,7 @@ index 3bc5cd1e53dd7c94b948e7f57f0dc8e073e349b0..87891161f5b06bb8be0e2016b490484e
                      throwable = throwable1;
                      throw throwable1;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index dd0daf3138a38d0c8a399e6cb54bbc58af47f710..53d847b863a957639ff2e58280861316838c0bec 100644
+index 073df4e4e21b7a57e8d4159e2c5d68bda11e3d51..f754692eaff308b4a057e6b48f90d919cedfea73 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1647,7 +1647,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -249,10 +249,10 @@ index 0000000000000000000000000000000000000000..cabfcebf9f944f7a2a2a1cffc7401435
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8255e88e18080028966e084b1fd896c084398aad..8aa8a6b869b2bfc2bcfb52a50df3436050f20dac 100644
+index 3549abdc88f2708e6ccea3f152ae37770bfe951b..0c3a095aa77f0406881cdacb118ffd93cf5b6060 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -233,7 +233,7 @@ import javax.annotation.Nullable; // Paper
+@@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
@@ -262,7 +262,7 @@ index 8255e88e18080028966e084b1fd896c084398aad..8aa8a6b869b2bfc2bcfb52a50df34360
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 697949abbe662a55fc31ad811863717e35b9d1b6..ed290f61ec5adcb3033c7cb7e0fcca8d9722c234 100644
+index a386beea01056a7fb448596ba45342d832a4c63d..3d56b60ec9f526ff31e5bdcf0f7b97858ad6a748 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -397,7 +397,7 @@ public final class CraftMagicNumbers implements UnsafeValues {

patches/server/0004-Purpur-config-files.patch

@@ -357,10 +357,10 @@ index 0000000000000000000000000000000000000000..536955124afaec5c8a070249c7432cb9
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8aa8a6b869b2bfc2bcfb52a50df3436050f20dac..77b20b418d74af25116c4a0182a96b23dce35d13 100644
+index 0c3a095aa77f0406881cdacb118ffd93cf5b6060..5ff123626972215afcb29c8070aca26e1e5c3509 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -868,6 +868,7 @@ public final class CraftServer implements Server {
+@@ -882,6 +882,7 @@ public final class CraftServer implements Server {
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
          com.tuinity.tuinity.config.TuinityConfig.init((File) console.options.valueOf("tuinity-settings")); // Tuinity - Server Config
@@ -368,7 +368,7 @@ index 8aa8a6b869b2bfc2bcfb52a50df3436050f20dac..77b20b418d74af25116c4a0182a96b23
          for (WorldServer world : console.getWorlds()) {
              world.worldDataServer.setDifficulty(config.difficulty);
              world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
-@@ -903,6 +904,7 @@ public final class CraftServer implements Server {
+@@ -917,6 +918,7 @@ public final class CraftServer implements Server {
              world.spigotConfig.init(); // Spigot
              world.paperConfig.init(); // Paper
              world.tuinityConfig.init(); // Tuinity - Server Config
@@ -376,7 +376,7 @@ index 8aa8a6b869b2bfc2bcfb52a50df3436050f20dac..77b20b418d74af25116c4a0182a96b23
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -921,6 +923,7 @@ public final class CraftServer implements Server {
+@@ -935,6 +937,7 @@ public final class CraftServer implements Server {
          reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
@@ -384,7 +384,7 @@ index 8aa8a6b869b2bfc2bcfb52a50df3436050f20dac..77b20b418d74af25116c4a0182a96b23
          overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
          ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2372,6 +2375,18 @@ public final class CraftServer implements Server {
+@@ -2384,6 +2387,18 @@ public final class CraftServer implements Server {
          }
          // Tuinity end - add config to timings report
  
@@ -404,7 +404,7 @@ index 8aa8a6b869b2bfc2bcfb52a50df3436050f20dac..77b20b418d74af25116c4a0182a96b23
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 86c7b5de4cc9f02365f0986a0e9b381f5edf395b..7d393684bb7301c619e0135186568135102d5ddb 100644
+index 57180e164ac51b1aac070c00d820792d13d67258..09168bced10094c2058ffe7a10613b83360d998b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -154,6 +154,14 @@ public class Main {

patches/server/0009-AFK-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index aea8d85aa087d896ea93f944b8d3403ea90c9bf4..3fdb32f8d8c647e2430fa364e5aaa40de803b025 100644
+index 32e400632ec1e61374f772c6262580f84a5b2288..aee1946f96ec6007caef63b2183c5218ffe71836 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -2086,8 +2086,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -2102,8 +2102,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      public void resetIdleTimer() {
          this.ca = SystemUtils.getMonotonicMillis();
@@ -86,7 +86,7 @@ index 4ed80e3bda7f984fa00320be647ac450c94fd72b..05dc6c1b83479bed2857ef799df8291d
                  } else if (entityplayer.isSleeping()) {
                      ++j;
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index e0c606bb6ecf23f2118a65775c05b437a09826d3..85964e7fe2cc96ad3b967dadd9ee5d095ee60e2a 100644
+index a4f7e57283950074005869e0098fe665e85286ca..e4eb83c5090c00fe405d061fe32b8e176baa264e 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -399,6 +399,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -263,7 +263,7 @@ index 361f7857e461578e90cb71e15027dadaf794cb69..2578a4677d1ee060f687be531e696b7c
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6f179a6c80b6b9ef90b01a987735364ec3f35602..36926b8ed2a0304c89296aa743510bb3c415a07e 100644
+index f82fb89e30e30681b2052d1c6a2f24428d6fbfc7..05bd48bb026a71dd420b4d73c58da781828d58e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2494,4 +2494,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0010-Bring-back-server-name.patch

@@ -17,10 +17,10 @@ index 1fab9b9c7d41a0d2a551096c2c15f741a887fa2d..f33309f4c1ad92960d0634f3f5b8105c
      public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
      public final boolean pvp = this.getBoolean("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 77b20b418d74af25116c4a0182a96b23dce35d13..e927ebb58e8dfc5333e3ea3ab74242bac9570593 100644
+index 5ff123626972215afcb29c8070aca26e1e5c3509..a78228bd594bf6d651d68f86a85b8d47602e7121 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2541,4 +2541,11 @@ public final class CraftServer implements Server {
+@@ -2553,4 +2553,11 @@ public final class CraftServer implements Server {
      }
  
      // Paper end

patches/server/0011-Configurable-server-mod-name.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable server mod name
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 53d847b863a957639ff2e58280861316838c0bec..4abb1d1dcbcc8351a52641eee2629335c3978551 100644
+index f754692eaff308b4a057e6b48f90d919cedfea73..f19d370052d9db98ed567f20dfc1abf968ae219b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1647,7 +1647,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

patches/server/0012-LivingEntity-safeFallDistance.patch

@@ -62,11 +62,11 @@ index 3b004160da9a2aed440a3ccda538d78f91c61e87..5e6a92dcdbca686d5a8cfc4aaff72b70
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 3d497f69f89455b88fba423de8effb3db83e7af4..b5040de9885556561416bf3282476f3b33925a62 100644
+index 4545bac9309f5a3aad617f48f7808d8ae829602d..d99ab01298c7e35eae806af8fc60d5beba89c826 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -843,4 +843,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -859,4 +859,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-         getHandle().setHurtDirection(hurtDirection);
+         throw new IllegalArgumentException(entityCategory + " is an unrecognized entity category");
      }
      // Paper end
 +

patches/server/0013-Lagging-threshold.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4abb1d1dcbcc8351a52641eee2629335c3978551..c8653b1214af3e08aa4f197c0e2923a81ed47ffc 100644
+index f19d370052d9db98ed567f20dfc1abf968ae219b..25ce3c3b76efd265fe9fbda2f6e49edde20bea45 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -280,6 +280,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -41,10 +41,10 @@ index 7eadf925c4e4429fa63fb02af9e87bf2ed68efa6..60ef024891e78e18c64435b7ee811807
      public static boolean enderChestSixRows = false;
      public static boolean enderChestPermissionRows = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e927ebb58e8dfc5333e3ea3ab74242bac9570593..5da39845f3ba82b40a3483333c41b57a2a0c10ac 100644
+index a78228bd594bf6d651d68f86a85b8d47602e7121..b435abc54cac0bc79fbefa30ac2d7d8fc8a2a996 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2547,5 +2547,10 @@ public final class CraftServer implements Server {
+@@ -2559,5 +2559,10 @@ public final class CraftServer implements Server {
      public String getServerName() {
          return getProperties().serverName;
      }

patches/server/0017-Player-invulnerabilities.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 3fdb32f8d8c647e2430fa364e5aaa40de803b025..b336e47b21a0693ebfeae8eb752258a3e2f6d4f4 100644
+index aee1946f96ec6007caef63b2183c5218ffe71836..e65a3e3e7bf6a366c30b44e166e2085966ebc933 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -285,6 +285,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -17,7 +17,7 @@ index 3fdb32f8d8c647e2430fa364e5aaa40de803b025..b336e47b21a0693ebfeae8eb752258a3
      }
      // Paper start
      public BlockPosition getPointInFront(double inFront) {
-@@ -1120,6 +1122,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1129,6 +1131,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      }
  
@@ -30,7 +30,7 @@ index 3fdb32f8d8c647e2430fa364e5aaa40de803b025..b336e47b21a0693ebfeae8eb752258a3
      @Override
      public boolean damageEntity(DamageSource damagesource, float f) {
          if (this.isInvulnerable(damagesource)) {
-@@ -1127,7 +1135,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1136,7 +1144,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          } else {
              boolean flag = this.server.j() && this.canPvP() && "fall".equals(damagesource.translationIndex);
  
@@ -39,7 +39,7 @@ index 3fdb32f8d8c647e2430fa364e5aaa40de803b025..b336e47b21a0693ebfeae8eb752258a3
                  return false;
              } else {
                  if (damagesource instanceof EntityDamageSource) {
-@@ -1303,6 +1311,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1312,6 +1320,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              }
              // Paper end
  
@@ -47,7 +47,7 @@ index 3fdb32f8d8c647e2430fa364e5aaa40de803b025..b336e47b21a0693ebfeae8eb752258a3
              return this;
          }
      }
-@@ -2504,9 +2513,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -2520,9 +2529,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public boolean isFrozen() { // Paper - protected > public
@@ -67,7 +67,7 @@ index 3fdb32f8d8c647e2430fa364e5aaa40de803b025..b336e47b21a0693ebfeae8eb752258a3
      public Scoreboard getScoreboard() {
          return getBukkitEntity().getScoreboard().getHandle();
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 85964e7fe2cc96ad3b967dadd9ee5d095ee60e2a..937983f27bf11634ccb9044d5dff42e7d77ec9ba 100644
+index e4eb83c5090c00fe405d061fe32b8e176baa264e..129e3083a029bc3f55f2f117fdc5f8faaadcf9c0 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -1901,6 +1901,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -108,7 +108,7 @@ index 2578a4677d1ee060f687be531e696b7c7be89e84..c441fcea9b2b5a77b801c8a69541cf42
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 36926b8ed2a0304c89296aa743510bb3c415a07e..d7f24ef07d731c83408ceff7bc5da7221d49d5e9 100644
+index 05bd48bb026a71dd420b4d73c58da781828d58e4..14b9e4c845d73946f4151c902e12aa0690b9414c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2510,5 +2510,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0020-Alternative-Keepalive-Handling.patch

@@ -17,7 +17,7 @@ index b4c37287362907b8507d156b978ba5b9d961bb7b..9e6e6636539702507abb78515e002819
          return this.a;
      }
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 937983f27bf11634ccb9044d5dff42e7d77ec9ba..1ca7f6cd38bde55bbea762d5ea7e9b73b735c92b 100644
+index 129e3083a029bc3f55f2f117fdc5f8faaadcf9c0..880521dfbf1513eee581c38c839f00b385b6fb33 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -233,6 +233,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

patches/server/0023-Fix-vanilla-command-permission-handler.patch

@@ -17,7 +17,7 @@ index c0fac7369b111e65b896a15848ae22457e5e8914..5278997e522b495b83e53cac5968388d
      public void removeCommand(String name) {
          children.remove(name);
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-index 5702f18cd39c1e7b5614c28a628108e2204b2ec1..b069ee845b2011b2c669b6c75d0a773f52e06e10 100644
+index 56a0665127c7c55049b8438c91e72b6881ed11e0..575bc7d8a433cd6d4755757d82fe3a18da184d5a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
 @@ -87,6 +87,7 @@ public final class VanillaCommandWrapper extends BukkitCommand {

patches/server/0025-Disable-outdated-build-check.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Disable outdated build check
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 7d393684bb7301c619e0135186568135102d5ddb..9ad2fe39dfd9f2b81c4aca4f56763443e514e433 100644
+index 09168bced10094c2058ffe7a10613b83360d998b..51cdc7e87413302a73416a5da724d873efb29657 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -266,7 +266,7 @@ public class Main {
+@@ -272,7 +272,7 @@ public class Main {
                      System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
                  }
  

patches/server/0046-Signs-allow-color-codes.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Signs allow color codes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index b336e47b21a0693ebfeae8eb752258a3e2f6d4f4..7128e72f6496768293d305bdecb1f1f3cd2220b0 100644
+index e65a3e3e7bf6a366c30b44e166e2085966ebc933..a8d60d288afd9b413494fe6abe8cfddb7c1f0b3b 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -1594,6 +1594,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1603,6 +1603,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public void openSign(TileEntitySign tileentitysign) {
@@ -17,7 +17,7 @@ index b336e47b21a0693ebfeae8eb752258a3e2f6d4f4..7128e72f6496768293d305bdecb1f1f3
          this.playerConnection.sendPacket(new PacketPlayOutOpenSignEditor(tileentitysign.getPosition()));
      }
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 1ca7f6cd38bde55bbea762d5ea7e9b73b735c92b..b685d23a4fabd6a09187a26b5a0bdb6b00b5893e 100644
+index 880521dfbf1513eee581c38c839f00b385b6fb33..a48a1e13adfc70ac0887b3a4c3c7f3a1d92a9606 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -3078,6 +3078,15 @@ public class PlayerConnection implements PacketListenerPlayIn {

patches/server/0048-Minecart-settings-and-WASD-controls.patch

@@ -22,10 +22,10 @@ index 2685a395a2eff9083cd8c654c4b7e2141b0ca99b..c2706c752f6ff5c131b6db469ae85dd7
          super(i, j, k);
      }
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 7128e72f6496768293d305bdecb1f1f3cd2220b0..ada349499fe4121f4e6ba2cf286d791cf80a1d6f 100644
+index a8d60d288afd9b413494fe6abe8cfddb7c1f0b3b..57900f89695bcce9aa6e90ab96007e456ef0448a 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -1133,6 +1133,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1142,6 +1142,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          if (this.isInvulnerable(damagesource)) {
              return false;
          } else {

patches/server/0050-Players-should-not-cram-to-death.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Players should not cram to death
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index ada349499fe4121f4e6ba2cf286d791cf80a1d6f..7376cf0f5e3873747acf5acc7918b4bd54e67095 100644
+index 57900f89695bcce9aa6e90ab96007e456ef0448a..c766ec5ac4519d1c734a10e667988ada040096c5 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -1571,7 +1571,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1580,7 +1580,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public boolean isInvulnerable(DamageSource damagesource) {

patches/server/0054-Skip-events-if-there-s-no-listeners.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Skip events if there's no listeners
 
 
 diff --git a/src/main/java/net/minecraft/commands/CommandDispatcher.java b/src/main/java/net/minecraft/commands/CommandDispatcher.java
-index 29a395e69aab9c50a45c5fd5ab8795fd8e3ef727..5ae31658fb1183eab66f682cc5477bc526c27753 100644
+index 7e30ec9a08d919d2ae9218ee0a11f77719129f07..b1bfc42b4153b225243ba65e7f937c0314cb39a5 100644
 --- a/src/main/java/net/minecraft/commands/CommandDispatcher.java
 +++ b/src/main/java/net/minecraft/commands/CommandDispatcher.java
-@@ -367,6 +367,7 @@ public class CommandDispatcher {
+@@ -368,6 +368,7 @@ public class CommandDispatcher {
      }
  
      private void runSync(EntityPlayer entityplayer, Collection<String> bukkit, RootCommandNode<ICompletionProvider> rootcommandnode) {
@@ -16,7 +16,7 @@ index 29a395e69aab9c50a45c5fd5ab8795fd8e3ef727..5ae31658fb1183eab66f682cc5477bc5
          // Paper end - Async command map building
          new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandListenerWrapper>(entityplayer.getBukkitEntity(), (RootCommandNode) rootcommandnode, false).callEvent(); // Paper
          PlayerCommandSendEvent event = new PlayerCommandSendEvent(entityplayer.getBukkitEntity(), new LinkedHashSet<>(bukkit));
-@@ -379,6 +380,7 @@ public class CommandDispatcher {
+@@ -380,6 +381,7 @@ public class CommandDispatcher {
              }
          }
          // CraftBukkit end

patches/server/0057-Configurable-TPS-Catchup.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable TPS Catchup
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c8653b1214af3e08aa4f197c0e2923a81ed47ffc..9fbec9f98bd0dd727ef58d7f3f18a8a8ab9910e2 100644
+index 25ce3c3b76efd265fe9fbda2f6e49edde20bea45..11e69678c04017faa66a7527e892c5db73cf235b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1133,7 +1133,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

patches/server/0074-Add-5-second-tps-average-in-tps.patch

@@ -27,7 +27,7 @@ index dc6bc1910ad0f9b27144d5750078c3ca607d03d3..e8be35f836ede2630d44902e99a21489
          setListData(vector);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9fbec9f98bd0dd727ef58d7f3f18a8a8ab9910e2..0cea9db58772d8c69b5cfdd4a2987593b2c9ea6c 100644
+index 11e69678c04017faa66a7527e892c5db73cf235b..b268068b5d2bc5f0d032e11ac38bf011a32df01c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -279,7 +279,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -69,10 +69,10 @@ index 9fbec9f98bd0dd727ef58d7f3f18a8a8ab9910e2..0cea9db58772d8c69b5cfdd4a2987593
                          lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
                          tickSection = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5da39845f3ba82b40a3483333c41b57a2a0c10ac..7cfa041d646f602221cbb0d8899ff682db7ca9ee 100644
+index b435abc54cac0bc79fbefa30ac2d7d8fc8a2a996..12282aaea7b1dce8f958914e41137b17544a159e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2321,6 +2321,7 @@ public final class CraftServer implements Server {
+@@ -2333,6 +2333,7 @@ public final class CraftServer implements Server {
      @Override
      public double[] getTPS() {
          return new double[] {

patches/server/0077-Add-ping-command.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add /ping command
 
 
 diff --git a/src/main/java/net/minecraft/commands/CommandDispatcher.java b/src/main/java/net/minecraft/commands/CommandDispatcher.java
-index 5ae31658fb1183eab66f682cc5477bc526c27753..94ed3811cbcc6f60a2c8bb033920f9c1ae2e91d6 100644
+index b1bfc42b4153b225243ba65e7f937c0314cb39a5..185dee82b86aa3abb04809ddcf31c81e29664c62 100644
 --- a/src/main/java/net/minecraft/commands/CommandDispatcher.java
 +++ b/src/main/java/net/minecraft/commands/CommandDispatcher.java
 @@ -191,6 +191,7 @@ public class CommandDispatcher {
@@ -16,7 +16,7 @@ index 5ae31658fb1183eab66f682cc5477bc526c27753..94ed3811cbcc6f60a2c8bb033920f9c1
          }
  
          if (commanddispatcher_servertype.d) {
-@@ -427,10 +428,12 @@ public class CommandDispatcher {
+@@ -428,10 +429,12 @@ public class CommandDispatcher {
  
      }
  
@@ -29,7 +29,7 @@ index 5ae31658fb1183eab66f682cc5477bc526c27753..94ed3811cbcc6f60a2c8bb033920f9c1
      public static <T> RequiredArgumentBuilder<CommandListenerWrapper, T> a(String s, ArgumentType<T> argumenttype) {
          return RequiredArgumentBuilder.argument(s, argumenttype);
      }
-@@ -446,6 +449,7 @@ public class CommandDispatcher {
+@@ -447,6 +450,7 @@ public class CommandDispatcher {
          };
      }
  

patches/server/0081-Implement-bed-explosion-options.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Implement bed explosion options
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/BlockBed.java b/src/main/java/net/minecraft/world/level/block/BlockBed.java
-index abe0a1c309d526de37efcac44922fa259e1d112c..db9ef25d0578538fd7c7950a3b3d03453da336f1 100644
+index 00a01a157deec004bcf2f8587723a0ecd0bfef85..d42a3e73c6e4e65f023fa5af65a26acbf2f01281 100644
 --- a/src/main/java/net/minecraft/world/level/block/BlockBed.java
 +++ b/src/main/java/net/minecraft/world/level/block/BlockBed.java
-@@ -137,7 +137,7 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
+@@ -138,7 +138,7 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
                      world.a(blockposition1, false);
                  }
  

patches/server/0084-Allow-color-codes-in-books.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow color codes in books
 
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index b685d23a4fabd6a09187a26b5a0bdb6b00b5893e..6970deaaf638428f1a90d5841b656a59e2f8ee71 100644
+index a48a1e13adfc70ac0887b3a4c3c7f3a1d92a9606..7a68762abd3334d6a5f43b680e5d18ace863ab95 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -1216,7 +1216,8 @@ public class PlayerConnection implements PacketListenerPlayIn {

patches/server/0085-Entity-lifespan.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Entity lifespan
 
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 6970deaaf638428f1a90d5841b656a59e2f8ee71..319b7b2b62fc4646591b29e3045f81b2df8a6a7b 100644
+index 7a68762abd3334d6a5f43b680e5d18ace863ab95..fb19b16e452571a4199b5cd152642fc01bb476ed 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -2463,6 +2463,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

patches/server/0086-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 7376cf0f5e3873747acf5acc7918b4bd54e67095..69d46439801f8a9ba60337febbb423b65049fd3c 100644
+index c766ec5ac4519d1c734a10e667988ada040096c5..b3d12463fbeb2045860c6b933da74980f778472e 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -2571,4 +2571,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -2587,4 +2587,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          return (CraftPlayer) super.getBukkitEntity();
      }
      // CraftBukkit end

patches/server/0103-Ridables.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Ridables
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0cea9db58772d8c69b5cfdd4a2987593b2c9ea6c..e3c3b2eb03ad132a91140cb459fd8f378154ee2e 100644
+index b268068b5d2bc5f0d032e11ac38bf011a32df01c..ad4e1d5154bebf7458c38bed7380f12d06c3eaaf 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1541,6 +1541,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -68,7 +68,7 @@ index 0000000000000000000000000000000000000000..8b66d1215a6eef1302b5ecb46a4b3d50
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 69d46439801f8a9ba60337febbb423b65049fd3c..326c0d4c9d849d271251a174a9231493133d3c5d 100644
+index b3d12463fbeb2045860c6b933da74980f778472e..d06bae9d71f23fccbfaf65c0fd9e9a550549432e 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -80,7 +80,6 @@ import net.minecraft.server.network.PlayerConnection;
@@ -87,7 +87,7 @@ index 69d46439801f8a9ba60337febbb423b65049fd3c..326c0d4c9d849d271251a174a9231493
  import net.minecraft.world.phys.AxisAlignedBB;
  import net.minecraft.world.phys.Vec3D;
  import net.minecraft.world.scores.ScoreboardScore;
-@@ -643,6 +641,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -652,6 +650,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
  
          this.advancementDataPlayer.b(this);
@@ -116,7 +116,7 @@ index ff704bc64146584d3e8085b332bada39912f71f3..faf6140085454b4e29869d6abe08353b
          return new Throwable(entity + " Added to world at " + new java.util.Date());
      }
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 319b7b2b62fc4646591b29e3045f81b2df8a6a7b..e30485236f947010a1c79ab7e704e0dd49b5ef60 100644
+index fb19b16e452571a4199b5cd152642fc01bb476ed..e1c42de5d1e3ddbdf8530a79e5eb9d4ac2c96236 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -2472,6 +2472,8 @@ public class PlayerConnection implements PacketListenerPlayIn {

patches/server/0107-LivingEntity-broadcastItemBreak.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index b5040de9885556561416bf3282476f3b33925a62..f0631331afc16576a21310f5575b56ae7663f399 100644
+index d99ab01298c7e35eae806af8fc60d5beba89c826..cf79f39fc8071d86f7455681e41b3eab1826cb35 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -854,5 +854,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -870,5 +870,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setSafeFallDistance(float safeFallDistance) {
          getHandle().safeFallDistance = safeFallDistance;
      }

patches/server/0122-Add-tablist-suffix-option-for-afk.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add tablist suffix option for afk
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 326c0d4c9d849d271251a174a9231493133d3c5d..999eb87c688f0bc5d3d4bb4beb9f468f0eadc184 100644
+index d06bae9d71f23fccbfaf65c0fd9e9a550549432e..adab7cf319ed7d77bdd0196709741f6704994a93 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -2135,7 +2135,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -2151,7 +2151,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
  
          if (world.purpurConfig.idleTimeoutUpdateTabList) {

patches/server/0126-Apply-display-names-from-item-forms-of-entities-to-e.patch

@@ -101,10 +101,10 @@ index cd46df5485ebfd597ea72360a27872d46174ee19..245d3fe09feb9dc27b097642d40664a9
                      world.playSound((EntityHuman) null, entityarmorstand.locX(), entityarmorstand.locY(), entityarmorstand.locZ(), SoundEffects.ENTITY_ARMOR_STAND_PLACE, SoundCategory.BLOCKS, 0.75F, 0.8F);
                  }
 diff --git a/src/main/java/net/minecraft/world/item/ItemBoat.java b/src/main/java/net/minecraft/world/item/ItemBoat.java
-index e24085facbc738c5eecbf85dee1b87072c41537c..8129381f8248fff81659dd27050a01e2986e0330 100644
+index 1d812b3e27f87213afc3e441eb20ca984458ce2a..636a8bc76d436fc770b4e05a93f1991210b64230 100644
 --- a/src/main/java/net/minecraft/world/item/ItemBoat.java
 +++ b/src/main/java/net/minecraft/world/item/ItemBoat.java
-@@ -67,6 +67,11 @@ public class ItemBoat extends Item {
+@@ -65,6 +65,11 @@ public class ItemBoat extends Item {
  
                  entityboat.setType(this.b);
                  entityboat.yaw = entityhuman.yaw;

patches/server/0134-Add-demo-command.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add demo command
 
 
 diff --git a/src/main/java/net/minecraft/commands/CommandDispatcher.java b/src/main/java/net/minecraft/commands/CommandDispatcher.java
-index 94ed3811cbcc6f60a2c8bb033920f9c1ae2e91d6..2f5e8ed345ace0d9abb7edebe1fd47e562b1d272 100644
+index 185dee82b86aa3abb04809ddcf31c81e29664c62..0ea56c863a9a1019b36f7f9f9164301aef12637b 100644
 --- a/src/main/java/net/minecraft/commands/CommandDispatcher.java
 +++ b/src/main/java/net/minecraft/commands/CommandDispatcher.java
 @@ -191,6 +191,7 @@ public class CommandDispatcher {

patches/server/0138-Add-boat-fall-damage-config.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add boat fall damage config
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 999eb87c688f0bc5d3d4bb4beb9f468f0eadc184..27d65af750e7b420da9d2817d75f257e4f729339 100644
+index adab7cf319ed7d77bdd0196709741f6704994a93..8a7f75baa730729dd0022fe74da15fe669eced24 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -1140,7 +1140,16 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1149,7 +1149,16 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          if (this.isInvulnerable(damagesource)) {
              return false;
          } else {

patches/server/0147-Spread-out-and-optimise-player-list-ticks.patch

@@ -56,7 +56,7 @@ index fc47887dfd3d32788fa11845c738af53126fba46..21c51883c73dfaa7ec874fb7f8ed7c28
  
      public void sendAll(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d7f24ef07d731c83408ceff7bc5da7221d49d5e9..4d442f2ec45ba023772887cfdb5e5e9f829b2701 100644
+index 14b9e4c845d73946f4151c902e12aa0690b9414c..e557157c5128ea89d728de2ab92b5e1a7b3437ef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1442,7 +1442,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0153-Implement-TPSBar.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement TPSBar
 
 
 diff --git a/src/main/java/net/minecraft/commands/CommandDispatcher.java b/src/main/java/net/minecraft/commands/CommandDispatcher.java
-index 2f5e8ed345ace0d9abb7edebe1fd47e562b1d272..ce95a7d9c967d723bad468bd00a5c0a6b887aa33 100644
+index 0ea56c863a9a1019b36f7f9f9164301aef12637b..4338b459011bf7a083790b7bb76cf1b24471fd19 100644
 --- a/src/main/java/net/minecraft/commands/CommandDispatcher.java
 +++ b/src/main/java/net/minecraft/commands/CommandDispatcher.java
 @@ -193,6 +193,7 @@ public class CommandDispatcher {
@@ -17,7 +17,7 @@ index 2f5e8ed345ace0d9abb7edebe1fd47e562b1d272..ce95a7d9c967d723bad468bd00a5c0a6
  
          if (commanddispatcher_servertype.d) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e3c3b2eb03ad132a91140cb459fd8f378154ee2e..176fc4c8b7c5ef45b29cb8aaa1b1ff16dbfc9b7c 100644
+index ad4e1d5154bebf7458c38bed7380f12d06c3eaaf..f0db6072ebce4b60dcf3b4bea774ddabb3061302 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -990,6 +990,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

patches/server/0155-PlayerBookTooLargeEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerBookTooLargeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index e30485236f947010a1c79ab7e704e0dd49b5ef60..91ceb9995ba04b3e42c2dc20de5bcbd553aca7f2 100644
+index e1c42de5d1e3ddbdf8530a79e5eb9d4ac2c96236..82e59d0f3e59992d6b40edb29cc5a01ea74e746f 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -1128,6 +1128,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

patches/server/0161-Add-EntityTeleportHinderedEvent.patch

@@ -123,7 +123,7 @@ index dcdc82b42689b4962323938a62cf7ded49afd6f4..4a70d657fd83627e8d66b52cb5f87381
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4d442f2ec45ba023772887cfdb5e5e9f829b2701..9320f3221e17cce102bd6ea119e5cc4137ce72ff 100644
+index e557157c5128ea89d728de2ab92b5e1a7b3437ef..dbac5843088e221cd7d654a0c872ef4451b53075 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -126,6 +126,7 @@ import org.bukkit.entity.EntityType;

patches/server/0165-Fix-stuck-in-portals.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix stuck in portals
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 27d65af750e7b420da9d2817d75f257e4f729339..d1a7fdf36c210f0412b2d9ca0539e1fddba172a6 100644
+index 8a7f75baa730729dd0022fe74da15fe669eced24..c69ef7ee5e40e2557b3a3971c6fb24c9966d6809 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -1290,6 +1290,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1299,6 +1299,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
                  playerlist.d(this);
                  worldserver1.removePlayer(this);
                  this.dead = false;

patches/server/0170-Add-unsafe-Entity-serialization-API.patch

@@ -46,7 +46,7 @@ index 4a70d657fd83627e8d66b52cb5f87381b43ad76a..af69023b241560031f6aa116561d7407
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index ed290f61ec5adcb3033c7cb7e0fcca8d9722c234..2ccceec865a44edfe606beac06508c30a5e398f0 100644
+index 3d56b60ec9f526ff31e5bdcf0f7b97858ad6a748..6cf499fa3ecf7619615063f087d35b6586ecf74b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -410,9 +410,14 @@ public final class CraftMagicNumbers implements UnsafeValues {

patches/server/0173-Dont-run-with-scissors.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Dont run with scissors!
 
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index 91ceb9995ba04b3e42c2dc20de5bcbd553aca7f2..d19cf0a3e0dbc46a2017de08bcf6e07619bc3a53 100644
+index 82e59d0f3e59992d6b40edb29cc5a01ea74e746f..bdf56b18e3cbd3e7c9925586fbc35ffd8992dbb2 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
 @@ -1552,6 +1552,12 @@ public class PlayerConnection implements PacketListenerPlayIn {

patches/server/0177-Config-to-ignore-nearby-mobs-when-sleeping.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index d1a7fdf36c210f0412b2d9ca0539e1fddba172a6..2b6e4d727d1d7484cbf0084770a89708ad157876 100644
+index c69ef7ee5e40e2557b3a3971c6fb24c9966d6809..96520df171fadbc90c130555bd0c7139579f73d8 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-@@ -1454,7 +1454,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1463,7 +1463,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
                              return entitymonster.f((EntityHuman) this);
                          });
  

patches/server/0202-Add-credits-command.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add credits command
 
 
 diff --git a/src/main/java/net/minecraft/commands/CommandDispatcher.java b/src/main/java/net/minecraft/commands/CommandDispatcher.java
-index ce95a7d9c967d723bad468bd00a5c0a6b887aa33..0703148d079d86921dac42ef90e514d3584bf569 100644
+index 4338b459011bf7a083790b7bb76cf1b24471fd19..c5babb19a3b4d20c4f9e414d5654d18c570d2b2d 100644
 --- a/src/main/java/net/minecraft/commands/CommandDispatcher.java
 +++ b/src/main/java/net/minecraft/commands/CommandDispatcher.java
 @@ -191,6 +191,7 @@ public class CommandDispatcher {

patches/server/0203-Gamemode-extra-permissions.patch

@@ -31,7 +31,7 @@ index 4480fe75cfad35a5104b5116c5ec2c80d18f15f5..d73daa29f784283e03ad2ea3126cca7e
          return this.d;
      }
 diff --git a/src/main/java/net/minecraft/server/commands/CommandGamemode.java b/src/main/java/net/minecraft/server/commands/CommandGamemode.java
-index 376d5eac9c17365266d8a4986bf4c19030454c9a..f004d027d673ec09c768c3ab0734b6b099921ef9 100644
+index 8da48d9cbadfbe83ae8410cf49d78df49f50fb08..94af223c5d241f9f26a12fcb8bf6343953ff80e5 100644
 --- a/src/main/java/net/minecraft/server/commands/CommandGamemode.java
 +++ b/src/main/java/net/minecraft/server/commands/CommandGamemode.java
 @@ -55,6 +55,7 @@ public class CommandGamemode {