Updated Upstream (Paper & Tuinity)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
b33b63908e Support complex components in written book builder (#6337)
bfb3d42b44 Optimize entity tracker passenger checks (#6361)
399710ff79 Add reobf mappings patch for MinecraftServer#getLootTables (#6368)
25cd8aba9f Config option for Piglins guarding chests (#4829)
80650e8936 Added EntityItemDamageEvent (#4928)

Tuinity Changes:
8e7cc4dc96 Do not submit profile lookups to worldgen threads

gradle.properties

@@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT
 mcVersion = 1.17.1
 packageVersion = 1_17_R1
 
-paperCommit = f261419fd5eeb771d0850918dd586501e60d2e51
+paperCommit = 80650e893678e726b0d5724031344eb2ec47a51a
 
 org.gradle.caching = true
 org.gradle.parallel = true

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

@@ -29938,6 +29938,33 @@ index 0000000000000000000000000000000000000000..f188ff6b08abddd06a3120fb15825e0f
 +        }
 +    }
 +}
+diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
+index 59437f04911662f06596ef61b91017caa6427eec..82e8338c69e846ab9ff0a9b9427d968e0a67927e 100644
+--- a/src/main/java/net/minecraft/Util.java
++++ b/src/main/java/net/minecraft/Util.java
+@@ -67,6 +67,22 @@ public class Util {
+     private static final AtomicInteger WORKER_COUNT = new AtomicInteger(1);
+     private static final ExecutorService BOOTSTRAP_EXECUTOR = makeExecutor("Bootstrap", -2); // Paper - add -2 priority
+     private static final ExecutorService BACKGROUND_EXECUTOR = makeExecutor("Main", -1); // Paper - add -1 priority
++    // Tuinity start - don't submit BLOCKING PROFILE LOOKUPS to the world gen thread
++    public static final ExecutorService PROFILE_EXECUTOR = Executors.newFixedThreadPool(2, new java.util.concurrent.ThreadFactory() {
++
++        private final AtomicInteger count = new AtomicInteger();
++
++        @Override
++        public Thread newThread(Runnable run) {
++            Thread ret = new Thread(run);
++            ret.setName("Profile Lookup Executor #" + this.count.getAndIncrement());
++            ret.setUncaughtExceptionHandler((Thread thread, Throwable throwable) -> {
++                LOGGER.fatal("Uncaught exception in thread " + thread.getName(), throwable);
++            });
++            return ret;
++        }
++    });
++    // Tuinity end - don't submit BLOCKING PROFILE LOOKUPS to the world gen thread
+     private static final ExecutorService IO_POOL = makeIoExecutor();
+     public static LongSupplier timeSource = System::nanoTime;
+     public static final UUID NIL_UUID = new UUID(0L, 0L);
 diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
 index b70aa66732fb5e957aed0901f4c76358b2c56f8e..b01d7da333bac7820e42b6f645634a15ef88ae4f 100644
 --- a/src/main/java/net/minecraft/core/BlockPos.java
@@ -32771,7 +32798,7 @@ index 0d143d073fa7cdfa14f12e9c795350dca8ac5e80..8b84befc6840d25dc3d6e2d42a4024a3
                  return true;
              } else {
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 2f3e69ad809199ffc2661d524bb627ec8dbc2e80..0fcd6a9162f5bddb3c4fc42b3a64efde7c7d9a9b 100644
+index e5cae2fb67541785072324e5434820ee4b169556..60e58d5f03c66146a86b49c4d1ef17080f094a4c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -173,7 +173,7 @@ public class ServerEntity {
@@ -33285,7 +33312,7 @@ index baa25df9f446c8edea9666983425df31c32a13ff..f9ed48f5bbde84fd1804e482f2777b51
  
          public void onTrackingStart(Entity entity) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 82eaf3bd7332b173197d81eaebdf58c6f43d6a23..8e795c9380eb0379838ab4881ba6393d57e8e92c 100644
+index 5ecfd9a1e39343746828520c307879547feb33a7..b0f5224ec677d2806fde65f495819b11775705e5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -261,7 +261,7 @@ public class ServerPlayer extends Player {
@@ -34059,7 +34086,7 @@ index 45e77d96f673ce68cf15ce3d45fd1eeffed4d8d8..9ab220ef0d20151d4e205f3edc213fd9
              throw new IllegalStateException("Protocol error", cryptographyexception);
          }
 diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
-index 61405c2b53e03a4b83e2c70c6e4d3739ca9676cb..1f307f8e3f0f484dad33e9af085dabd93a3509fd 100644
+index 61405c2b53e03a4b83e2c70c6e4d3739ca9676cb..357efb989362e0be8cb08533ad677634f0b390f7 100644
 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
 +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
 @@ -62,6 +62,11 @@ public class GameProfileCache {
@@ -34133,6 +34160,15 @@ index 61405c2b53e03a4b83e2c70c6e4d3739ca9676cb..1f307f8e3f0f484dad33e9af085dabd9
      }
  
      public void getAsync(String username, Consumer<Optional<GameProfile>> consumer) {
+@@ -187,7 +200,7 @@ public class GameProfileCache {
+             } else {
+                 this.requests.put(username, CompletableFuture.supplyAsync(() -> {
+                     return this.get(username);
+-                }, Util.backgroundExecutor()).whenCompleteAsync((optional, throwable) -> {
++                }, Util.PROFILE_EXECUTOR).whenCompleteAsync((optional, throwable) -> { // Tuinity - not a good idea to use BLOCKING OPERATIONS on the worldgen executor
+                     this.requests.remove(username);
+                 }, this.executor).whenCompleteAsync((optional, throwable) -> {
+                     consumer.accept(optional);
 @@ -322,7 +335,9 @@ public class GameProfileCache {
      }
  
@@ -34144,7 +34180,7 @@ index 61405c2b53e03a4b83e2c70c6e4d3739ca9676cb..1f307f8e3f0f484dad33e9af085dabd9
  
      private static JsonElement writeGameProfile(GameProfileCache.GameProfileInfo entry, DateFormat dateFormat) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 48045993c8ad4b014cf4a67f7c4db42e014d1c81..936ae5576902e6593bd21af4d3cf3998109347b5 100644
+index 9966d0bb4f85866a46f5e4098416ab9af81f8d9f..ea8956b2c4cbe7059512ebfa9fd7a865e5fae0ac 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -177,6 +177,7 @@ public abstract class PlayerList {
@@ -35698,6 +35734,19 @@ index aa1ba8b74ab70b6cede99e4853ac0203f388ab06..a242a80b16c7d074d52a52728646224b
      }
  
      @Override
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java
+index 6381544b0038de9a09c01238638e4e127e4eddc6..5bdec9531f2f2b1f50ed3b71ab79f2b058647a07 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java
+@@ -150,7 +150,7 @@ public class SkullBlockEntity extends BlockEntity {
+     public static void updateGameprofile(@Nullable GameProfile owner, Consumer<GameProfile> callback) {
+         if (owner != null && !StringUtil.isNullOrEmpty(owner.getName()) && (!owner.isComplete() || !owner.getProperties().containsKey("textures")) && profileCache != null && sessionService != null) {
+             profileCache.getAsync(owner.getName(), (profile) -> {
+-                Util.backgroundExecutor().execute(() -> {
++                Util.PROFILE_EXECUTOR.execute(() -> { // Tuinity - not a good idea to use BLOCKING OPERATIONS on the worldgen executor
+                     Util.ifElse(profile, (profilex) -> {
+                         Property property = Iterables.getFirst(profilex.getProperties().get("textures"), (Property)null);
+                         if (property == null) {
 diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 index 1179c62695da4dcf02590c97d8da3c6fcdbee9ef..04d5ef90cd4171f9360017ac0c01ce48ae6ec983 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
@@ -38642,7 +38691,7 @@ index 85ca30aef0703db6859e66c62781ecfd334426e7..8ce49478441e77cedf5148ecb81d78b3
      @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 9e8918d03b8213e5f6689fc93030138fd704aca9..5038bd2d0920ffc37a33d0c971cf28c330e58e06 100644
+index 3971fed7a0d1399117366a5d7dd2e84adbfda55a..7eed75ad1d5d7c62f35bdaed3766fcdb7aac2ce6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -517,15 +517,70 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0071-Implement-elytra-settings.patch

@@ -54,7 +54,7 @@ index 543a08f920319a2547258640bafebb1e70af65c4..dd211aa7c4ef1e158933a89898b9e5bc
                      itemStack.shrink(1);
                      } else ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 9106d48e1ffab9687cd3295d9bb0410cdf875df4..1ecc0b740758c878a5a196524fbaa238b6689ac5 100644
+index 7b1393f3c1acf29318de8222ef54032a449b03f3..d1b4fe830170ddee2b6f39eba29e7068e6ae37a3 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -540,7 +540,7 @@ public final class ItemStack {
@@ -66,8 +66,8 @@ index 9106d48e1ffab9687cd3295d9bb0410cdf875df4..1ecc0b740758c878a5a196524fbaa238
                  int k = 0;
  
                  for (int l = 0; j > 0 && l < amount; ++l) {
-@@ -586,6 +586,12 @@ public final class ItemStack {
-                 if (this.hurt(amount, entity.getRandom(), entity instanceof ServerPlayer ? (ServerPlayer) entity : null)) {
+@@ -594,6 +594,12 @@ public final class ItemStack {
+                 if (this.hurt(amount, entity.getRandom(), entity /*instanceof ServerPlayer ? (ServerPlayer) entity : null*/)) { // Paper - pass LivingEntity for EntityItemDamageEvent
                      breakCallback.accept(entity);
                      Item item = this.getItem();
 +                    // Purpur start
@@ -99,7 +99,7 @@ index 510ed67a7de2b503ab8b01db57ed09ee33b0d825..3f53dc8f250ad3f7616ce7ef0a2353ca
                          entityhuman.startAutoSpinAttack(20);
                          if (entityhuman.isOnGround()) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 996346851c4b3ce181b1ae5431bea693d04b923f..c54e3fe327a677e622b2a6b300c8e6fe72d13ca6 100644
+index ec4eacc03b51944eaaa92a6326bc059faa558750..dd00807ca9893f5919c6e76e30145e118ce343ea 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -98,6 +98,19 @@ public class PurpurWorldConfig {

patches/server/0132-PaperPR-Config-option-for-Piglins-guarding-chests.patch

@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Wed, 2 Dec 2020 03:07:58 -0800
-Subject: [PATCH] PaperPR - 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
---- 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 {
-         zombiesTargetTurtleEggs = getBoolean("zombies-target-turtle-eggs", zombiesTargetTurtleEggs);
-     }
- 
-+    public boolean piglinsGuardChests = true;
-+    private void piglinsGuardChests() {
-+        piglinsGuardChests = getBoolean("piglins-guard-chests", piglinsGuardChests);
-+    }
-+
-     public boolean useEigencraftRedstone = false;
-     private void useEigencraftRedstone() {
-         useEigencraftRedstone = this.getBoolean("use-faster-eigencraft-redstone", false);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-index 4330ccefe92c76a516f42a81b38536cf3312be5b..7fa5cde9c26c21d4d800f720f373a8b702f4fcb5 100644
---- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-@@ -468,6 +468,7 @@ public class PiglinAi {
-     }
- 
-     public static void angerNearbyPiglins(Player player, boolean blockOpen) {
-+        if (!player.level.paperConfig.piglinsGuardChests) return; // Paper
-         List<AbstractPiglin> list = (List) player.level.getEntitiesOfClass(Piglin.class, player.getBoundingBox().inflate(16.0D)); // CraftBukkit - decompile error
- 
-         list.stream().filter(PiglinAi::isIdle).filter((entitypiglin) -> {

patches/server/0136-Spread-out-and-optimise-player-list-ticksSpread-out-.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Spread out and optimise player list ticksSpread out and
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1d89441b6d650691aef4bbbb714cee1f3d73774a..29043f9354b29f7766f1d6d8e793e2ea23883fa0 100644
+index c1d79527abc7c8a165872758db3d5240615a63aa..2381d75295554c0310e36a26f5332063b126adc9 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1012,22 +1012,22 @@ public abstract class PlayerList {
@@ -46,7 +46,7 @@ index 1d89441b6d650691aef4bbbb714cee1f3d73774a..29043f9354b29f7766f1d6d8e793e2ea
  
      public void broadcastAll(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 e9b440d1ec4a0c8155c80ee88e76b462a1bfdb06..61194cb8aa88f8cf2eb7da1c6ac17d94a5c02355 100644
+index de370ef508e72e16e43b872cbad032b414b6cf62..c298e104e01e7dd5c1e671822d8544e1e969d6c6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1564,7 +1564,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0143-PlayerBookTooLargeEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerBookTooLargeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a4e38e61138b2bfeee30a76e1f0e199d79bedfe9..9b0067709240582bfd69fd4d8c49b5321c447448 100644
+index e5c08a0305aed04906e5a5578023c9b0b0821381..2e67a26419c706d78bd793bd616cbbff704833bb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1122,10 +1122,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

patches/server/0144-Full-netherite-armor-grants-fire-resistance.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Full netherite armor grants fire resistance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index d57a1984328750f5a6db748ef2db21fb3e2dff00..656b62c93dcbe15a79ebe684c18f4dc31ddc0dbe 100644
+index 12a3304c3b465f2a9d7cf279ea7b945bb3b8f6a1..51e0701385c94822f83e8b628967ef9d36a10085 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -360,6 +360,16 @@ public abstract class Player extends LivingEntity {
@@ -26,7 +26,7 @@ index d57a1984328750f5a6db748ef2db21fb3e2dff00..656b62c93dcbe15a79ebe684c18f4dc3
  
      protected ItemCooldowns createItemCooldowns() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c950dfc7087d9d66a45724926d21f9bb3a0ee30f..6db99a6c7cb59f4ae23cee76e4ce3d794ff3dfc7 100644
+index 083a450dcd285434c5c6d1ffb52f29d590d3609a..126825703e1c5b835b2b1e9b950a7b6c56dacd0c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -266,6 +266,19 @@ public class PurpurWorldConfig {

patches/server/0152-Movement-options-for-armor-stands.patch

@@ -66,7 +66,7 @@ index 796ab61f4513c02b0d55d34044d2f7084c447796..d119f8ab447bc17deabc494463de4961
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 72324d44fa003acbe832998b4efb395095e93ef9..64bfc25a823f26e751f6f27a829a8333cdb8e145 100644
+index c4795689fdf5bdccd6f2b16f93801be769fa8565..50f271ff9949241caec638d96caa782f945b7d52 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -102,10 +102,16 @@ public class PurpurWorldConfig {

patches/server/0159-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/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9b0067709240582bfd69fd4d8c49b5321c447448..9a16f301f00dec3c1ce60ac6b1dbe58d7946ef21 100644
+index 2e67a26419c706d78bd793bd616cbbff704833bb..43d124818c4538bc0d84111dfab25c38aab249c1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1555,6 +1555,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -43,7 +43,7 @@ index da4d5b05cf2daa31ecd70d2815017bbb6e771313..ccd228aa323eef108526640dfe03b075
  
      public static int seedFeatureBamboo = -1;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e7c5bd69c447b3082f541cd4f0e2879ffe471b50..5c88e603a5a2db48ae19a360e0f44f86bec11a5d 100644
+index ee84e6aef5c0e747c71c2b345eebfb99da406b8d..7ea2cf4712963cbb2a750ade4d5609ee49be9732 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -156,6 +156,8 @@ public class PurpurWorldConfig {

patches/server/0162-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch

@@ -43,7 +43,7 @@ index 749ab72edc0d2e9c6f1161415ab8d59d3d6ca976..897c202c0905040072a06fdfa2032a7f
                  // Paper end
                  if (user instanceof net.minecraft.server.level.ServerPlayer) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4223cdaa1b0f89e18a54375a69e78bdfd05df0ba..2595fc1fc1fd89238d9217339fefc6a4fd1ac6a9 100644
+index 2b2668e3245a9bf13942de18fdfc3ea38a41a873..44ffdbe9fa16ab111e2f598a47ba54194d4d94dd 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -158,6 +158,10 @@ public class PurpurWorldConfig {

patches/server/0175-Drowning-Settings.patch

@@ -18,7 +18,7 @@ index 565af7ade5c3de6a1c7a01755db1b7c6c16f0a3c..f9fd38138fd50b7934f19fb295493a34
  
      public int getAirSupply() {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 59e4e240420a11b19b6da199092590ebe9096383..f6fa7ff3f896dca5e3b5cc5f7836f4208b0ec8b6 100644
+index 276bac768069d14b0015eed3f31f98c38978df0b..7ec708e19f62c53cc64327affef3111d4841e09d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -425,7 +425,7 @@ public abstract class LivingEntity extends Entity {
@@ -40,7 +40,7 @@ index 59e4e240420a11b19b6da199092590ebe9096383..f6fa7ff3f896dca5e3b5cc5f7836f420
                  }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7740e9981d89d7f36ae51ba0e06895772cd01f71..eb03155d5bf4edbd6169598eedf0ff5819fa717e 100644
+index d734218c0b7277348b0ea4002259f19e59bc31f0..106ab026e1cdd4365176ac3d6fdd3012a1d4d345 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -121,6 +121,15 @@ public class PurpurWorldConfig {

patches/server/0178-Config-to-show-Armor-Stand-arms-on-spawn.patch

@@ -17,7 +17,7 @@ index d119f8ab447bc17deabc494463de496161c9b126..c9a44a4765f43b9c0247ed1005f4c134
  
      public ArmorStand(Level world, double x, double y, double z) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 74c4888e2522c414f31d4c73f601cd33e9c6fdc0..44cf702e0ac60c90e7ee7601ade3c28b95401edb 100644
+index e9ff5fbf5d4524cee836afd85618355bd9c53821..95277d97f1e35e9a05fd289f6a639b50fa820c61 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -105,6 +105,7 @@ public class PurpurWorldConfig {

patches/server/0180-Config-to-allow-for-unsafe-enchants.patch

@@ -58,10 +58,10 @@ index 410ac71efff92dfa1f1e11895d0f5bf3fca1be17..f380659b261253e327f018ce9b54b151
                  ((ServerPlayer) player).connection.send(new ClientboundContainerSetDataPacket(containerId, 0, cost.get()));
              }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 1ecc0b740758c878a5a196524fbaa238b6689ac5..b3b5b75e3df805027c5daa98d7fc1d4d5f0d9675 100644
+index d1b4fe830170ddee2b6f39eba29e7068e6ae37a3..115f8eb919e90bc4a79db1d0f7875a31cc962f07 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -1137,6 +1137,12 @@ public final class ItemStack {
+@@ -1145,6 +1145,12 @@ public final class ItemStack {
          return this.tag != null && this.tag.contains("Enchantments", 9) ? !this.tag.getList("Enchantments", 10).isEmpty() : false;
      }
  

patches/server/0191-Configurable-broadcast-settings.patch

@@ -17,7 +17,7 @@ index c46df052a5a39d92688f51377ee1f7b5b5b36faa..d7d2a975386cecb0d50b4f7ed37de8ad
                      // Paper end
                  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 1bb9e89e332dd7cce479bcb393066518a82b68ad..1156b34fa5d19042621caafa4aaeae8020cd646d 100644
+index 90f91e5438e1fbd27da59fec004969c572517d8e..b2bf0ce295520e7dc6f17fd904769e47164675eb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -880,6 +880,7 @@ public class ServerPlayer extends Player {

patches/server/0198-Configurable-powered-rail-boost-modifier.patch

@@ -18,7 +18,7 @@ index 1e3077a22d9d3d26356b865001dcce81c9c1d7e5..cc57ff699d159a0cc748e91b61d53965
                  Vec3 vec3d5 = this.getDeltaMovement();
                  double d21 = vec3d5.x;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 283736fd4015855db885ee1cb4bd82726c361285..a441932a1a0cc80d6cd0c6435ec6e4aa63730f79 100644
+index b54dba107a355fe8f4e12f0763fb0b6590788c05..2bef8f37783cd83ac10a41103c3fa868a8cc9fea 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -226,6 +226,7 @@ public class PurpurWorldConfig {

patches/server/0207-Config-MobEffect-by-world.patch

@@ -40,7 +40,7 @@ index 79e036d79dec2ec4404baf02c23ba5ccad20cdce..6706d8e6d43cc5f3058f08fdfde77bed
  
                  ((ServerPlayer) entityhuman).connection.send(new ClientboundSetHealthPacket(((ServerPlayer) entityhuman).getBukkitEntity().getScaledHealth(), entityhuman.getFoodData().foodLevel, entityhuman.getFoodData().saturationLevel));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a514f29544898631b2470d4955928e5674242129..c6497e04af21ba471ab60e68cff32a28fec09768 100644
+index 5f474e9acfeb02e86a4afc7a3ada24368aadfc2c..4fc9bd6a8b84a77008dad75b8d62b82180093320 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -282,6 +282,21 @@ public class PurpurWorldConfig {

patches/server/0211-Flying-Fall-Damage-API.patch

@@ -26,7 +26,7 @@ index 24523dd712329f2f3abe40bb3f1801ef7946e831..ebd744b08e27d6fc6dda31ada7ad8bb1
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0d6cf86a55013bee91821926532907515f1a3919..8909e850d787b3bc1adbed9b614a2b8678d47f55 100644
+index 6b268b7fd1fc81d0b43986e4ef4dc0bbe73aa4f7..41b7f84c74f12d35da163cc688f624569500f50b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2590,5 +2590,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0214-Allow-player-join-full-server-by-permission.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow player join full server by permission
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 9a0065bd8eeb758daeb49d82ba8f2c09a6e4f533..94df8ba1b38fb5df039d5ddcb0374d0147d9b3ed 100644
+index a387b3b5aa510dcd99d71446d723ce79c82dad33..1b61cc59a120261dbf178865471a7ee2620977f1 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -765,7 +765,7 @@ public abstract class PlayerList {

patches/server/0216-Add-permission-bypass-for-portal-waiting.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add permission bypass for portal waiting
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 79782538277b60a1c1c16c1c75b53b7d8a2c00ee..2064f93074a58c116352ee768ef9ad9663004641 100644
+index bae254bd927cf1715a98c55354941c2341f69694..8d62bbb4fb818bea940bbac565cb8e30cb85818e 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -184,6 +184,7 @@ public abstract class Player extends LivingEntity {

patches/server/0218-Eating-glow-berries-adds-glow-effect.patch

@@ -18,7 +18,7 @@ index 89d4b7e4cd4222b61b49833fceda56ffa39710fa..1eb50f0bc41db79f091f900861ba71d7
      public static final Item SOUL_CAMPFIRE = registerBlock(Blocks.SOUL_CAMPFIRE, CreativeModeTab.TAB_DECORATIONS);
      public static final Item SHROOMLIGHT = registerBlock(Blocks.SHROOMLIGHT, CreativeModeTab.TAB_DECORATIONS);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ff6d4741e060674ef1c45f5a526d83affddec575..cc73654ef40f9a0d2ea03bd5f424747f1fb85044 100644
+index 35a0a270fad348a2f60ae3f9a480f1a527f525ed..a45d894c8234babc0a7b3b8ee03b92d192df168f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -173,6 +173,7 @@ public class PurpurWorldConfig {

patches/server/0226-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] SPIGOT-5988 Fix bed respawn location not resetting
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 94df8ba1b38fb5df039d5ddcb0374d0147d9b3ed..54f5e11b636649d1fb5a1b5cc05427b81341e10f 100644
+index 1b61cc59a120261dbf178865471a7ee2620977f1..9770a8b7ce0b27c0cb9851ac942b3089a053dc7b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -903,6 +903,7 @@ public abstract class PlayerList {

patches/server/0227-Store-placer-on-Block-when-placed.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Store placer on Block when placed
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index b3b5b75e3df805027c5daa98d7fc1d4d5f0d9675..af0a195fb82eb7872bc6206d39c2963bd468ccd6 100644
+index 115f8eb919e90bc4a79db1d0f7875a31cc962f07..d8df4457c28225508d9cb53ed6ea12d2f58648b8 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -381,6 +381,7 @@ public final class ItemStack {