Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@b327e17 Fix regenerate chunk method
PaperMC/Paper@22ac7d6 Add internal netty pipeline events
PaperMC/Paper@345a6a6 Updated Upstream (CraftBukkit)
PaperMC/Paper@86f87ba Fix custom merchant trade event world reference

gradle.properties

@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19-R0.1-SNAPSHOT
 
-paperCommit = 44b6869fd2f96801b64d3d04be9ead160a35d2cd
+paperCommit = 86f87ba40030d719e5fb8840ab18c513588de772
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/server/0005-Purpur-client-support.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 353463084d90eb684717e65c56da52cd25a1e375..6b63a8e880e93866e12e90769951bfcd844528f9 100644
+index 5f0d934399991ae94795ad0a94da689c242ffeba..cf6388c6d339cf011ce0a254b0aacb51fd06347b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -260,6 +260,7 @@ public class ServerPlayer extends Player {
+@@ -261,6 +261,7 @@ public class ServerPlayer extends Player {
      public Integer clientViewDistance;
      // CraftBukkit end
      public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper

patches/server/0007-Component-related-conveniences.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Component related conveniences
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6b63a8e880e93866e12e90769951bfcd844528f9..6ddcb6cce953efd869ddf48b57bbd42f060bed01 100644
+index cf6388c6d339cf011ce0a254b0aacb51fd06347b..bcd496de1e4d38dd527705057f6c3152f0bd8e0d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1705,6 +1705,26 @@ public class ServerPlayer extends Player {
+@@ -1706,6 +1706,26 @@ public class ServerPlayer extends Player {
          this.lastSentExp = -1; // CraftBukkit - Added to reset
      }
  
@@ -81,7 +81,7 @@ index 67bce77093dcc126098731047447da2031e3388d..c4088446d30c3b25cf196f51fd394cd0
          return this.isFireSource;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1ea1b51ceb0f90d30ca92a1b790bb7674ccef4b4..ecc0603742c67ef4e3bf8f604ebd06c2da5db029 100644
+index 3cb33e63a06a7baa013dbb0038debd7f683a6f4a..0a4f939c14ce6cc84b0833e417591ee2cb9a50fd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3786,6 +3786,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0008-Ridables.patch

@@ -46,10 +46,10 @@ index 4094d08d478a98cb4ff13ff3274ad0d88cd46e85..be388b21b256ba68e42b8f998722ef5d
          return new Throwable(entity + " Added to world at " + new java.util.Date());
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6ddcb6cce953efd869ddf48b57bbd42f060bed01..96e7815bde8274d303b1b7080358a3f7f1837146 100644
+index bcd496de1e4d38dd527705057f6c3152f0bd8e0d..8c7032fa2a29d67ddf832a6051c0b58821a64b11 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -668,6 +668,15 @@ public class ServerPlayer extends Player {
+@@ -669,6 +669,15 @@ public class ServerPlayer extends Player {
          this.trackStartFallingPosition();
          this.trackEnteredOrExitedLavaOnVehicle();
          this.advancements.flushDirty(this);
@@ -79,7 +79,7 @@ index 19cbccc56a526d597bd9124d38c84a85f6ad237d..472a5dac726c77caa34b2f1343495cae
                          if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
                              ServerGamePacketListenerImpl.this.send(new ClientboundAddEntityPacket(entity));
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ecc0603742c67ef4e3bf8f604ebd06c2da5db029..b6222cab36cdd94a3b31254f94e18d477078dbfc 100644
+index 0a4f939c14ce6cc84b0833e417591ee2cb9a50fd..e91e54d37bc6417d3abab000b6f15eb0a14a6a0c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -362,7 +362,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0013-AFK-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 96e7815bde8274d303b1b7080358a3f7f1837146..a11030df2eaaae4a0b5710f4d5d32033c30be9b1 100644
+index 8c7032fa2a29d67ddf832a6051c0b58821a64b11..14b778756bc7e0a6ad1996c23d142ccb3431ef04 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2006,8 +2006,58 @@ public class ServerPlayer extends Player {
+@@ -2007,8 +2007,58 @@ public class ServerPlayer extends Player {
  
      public void resetLastActionTime() {
          this.lastActionTime = Util.getMillis();

patches/server/0020-Player-invulnerabilities.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a11030df2eaaae4a0b5710f4d5d32033c30be9b1..70fe7e8a0e67c1c32cc33846c26020fe5b81f711 100644
+index 14b778756bc7e0a6ad1996c23d142ccb3431ef04..92e627494e0c0c49c252f546563f115fb3beb296 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -261,6 +261,7 @@ public class ServerPlayer extends Player {
+@@ -262,6 +262,7 @@ public class ServerPlayer extends Player {
      // CraftBukkit end
      public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
      public boolean purpurClient = false; // Purpur
@@ -16,7 +16,7 @@ index a11030df2eaaae4a0b5710f4d5d32033c30be9b1..70fe7e8a0e67c1c32cc33846c26020fe
  
      public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
-@@ -337,6 +338,7 @@ public class ServerPlayer extends Player {
+@@ -338,6 +339,7 @@ public class ServerPlayer extends Player {
          this.bukkitPickUpLoot = true;
          this.maxHealthCache = this.getMaxHealth();
          this.cachedSingleMobDistanceMap = new com.destroystokyo.paper.util.PooledHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
@@ -24,7 +24,7 @@ index a11030df2eaaae4a0b5710f4d5d32033c30be9b1..70fe7e8a0e67c1c32cc33846c26020fe
      }
      // Paper start - Chunk priority
      public BlockPos getPointInFront(double inFront) {
-@@ -1019,6 +1021,12 @@ public class ServerPlayer extends Player {
+@@ -1020,6 +1022,12 @@ public class ServerPlayer extends Player {
  
      }
  
@@ -37,7 +37,7 @@ index a11030df2eaaae4a0b5710f4d5d32033c30be9b1..70fe7e8a0e67c1c32cc33846c26020fe
      @Override
      public boolean hurt(DamageSource source, float amount) {
          if (this.isInvulnerableTo(source)) {
-@@ -1026,7 +1034,7 @@ public class ServerPlayer extends Player {
+@@ -1027,7 +1035,7 @@ public class ServerPlayer extends Player {
          } else {
              boolean flag = this.server.isDedicatedServer() && this.isPvpAllowed() && "fall".equals(source.msgId);
  
@@ -46,7 +46,7 @@ index a11030df2eaaae4a0b5710f4d5d32033c30be9b1..70fe7e8a0e67c1c32cc33846c26020fe
                  return false;
              } else {
                  if (source instanceof EntityDamageSource) {
-@@ -1199,6 +1207,7 @@ public class ServerPlayer extends Player {
+@@ -1200,6 +1208,7 @@ public class ServerPlayer extends Player {
              }
              // Paper end
  
@@ -54,7 +54,7 @@ index a11030df2eaaae4a0b5710f4d5d32033c30be9b1..70fe7e8a0e67c1c32cc33846c26020fe
              return this;
          }
      }
-@@ -1992,6 +2001,7 @@ public class ServerPlayer extends Player {
+@@ -1993,6 +2002,7 @@ public class ServerPlayer extends Player {
      }
  
      public void sendTexturePack(String url, String hash, boolean required, @Nullable Component resourcePackPrompt) {
@@ -62,7 +62,7 @@ index a11030df2eaaae4a0b5710f4d5d32033c30be9b1..70fe7e8a0e67c1c32cc33846c26020fe
          this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt));
      }
  
-@@ -2517,9 +2527,17 @@ public class ServerPlayer extends Player {
+@@ -2518,9 +2528,17 @@ public class ServerPlayer extends Player {
  
      @Override
      public boolean isImmobile() {

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Minecart settings and WASD controls
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 70fe7e8a0e67c1c32cc33846c26020fe5b81f711..e774a7c2265b4a307fde305176c7e9ec33e1e61f 100644
+index 92e627494e0c0c49c252f546563f115fb3beb296..73222027287462326312cce02faef2b272850c09 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1032,6 +1032,7 @@ public class ServerPlayer extends Player {
+@@ -1033,6 +1033,7 @@ public class ServerPlayer extends Player {
          if (this.isInvulnerableTo(source)) {
              return false;
          } else {

patches/server/0081-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/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 02447483c634e21821fd2effd9b4e9a15818a662..c9757c20404aec1125a645d94c9af077408bbf5a 100644
+index 73222027287462326312cce02faef2b272850c09..c8495f6944ae4837ede2c3680f02ecf112106ea6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2588,4 +2588,26 @@ public class ServerPlayer extends Player {
+@@ -2589,4 +2589,26 @@ public class ServerPlayer extends Player {
      // CraftBukkit end
  
      public final int getViewDistance() { throw new UnsupportedOperationException("Use PlayerChunkLoader"); } // Paper - placeholder
@@ -36,7 +36,7 @@ index 02447483c634e21821fd2effd9b4e9a15818a662..c9757c20404aec1125a645d94c9af077
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index dc6177e8d5c6f6615ccbfa55a2e0a8c891fc6b52..d75a3d62eeb151c2451b20feb7fd088c513a2571 100644
+index ee692849dc76ef0448df647e4035cf3a53ff5dde..b1f8e3906729fdd7e392f10d3f04ec4bc4ad7a98 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -44,6 +44,7 @@ import net.minecraft.network.syncher.EntityDataAccessor;

patches/server/0117-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/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 63b04bf9fc97554c309b8caac5cb942b9483208d..e9177d815c99450007ddfc9de59cebaa3ae74688 100644
+index c8495f6944ae4837ede2c3680f02ecf112106ea6..73a764c56a77e376bbca7ec098092d133cd2c2e0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1032,7 +1032,16 @@ public class ServerPlayer extends Player {
+@@ -1033,7 +1033,16 @@ public class ServerPlayer extends Player {
          if (this.isInvulnerableTo(source)) {
              return false;
          } else {

patches/server/0127-Implement-TPSBar.patch

@@ -41,10 +41,10 @@ index 13361a344130e32b8145762028caa289cab96f00..b21e0abbc511644274eb2987ea1ff9c8
          }
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e9177d815c99450007ddfc9de59cebaa3ae74688..7d7fc0bc857d39cd447f9669d1bd780e64846645 100644
+index 73a764c56a77e376bbca7ec098092d133cd2c2e0..e1d9680a2d4ced9a51f47e20496868a0f052178d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -262,6 +262,7 @@ public class ServerPlayer extends Player {
+@@ -263,6 +263,7 @@ public class ServerPlayer extends Player {
      public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
      public boolean purpurClient = false; // Purpur
      public boolean acceptingResourcePack = false; // Purpur
@@ -52,7 +52,7 @@ index e9177d815c99450007ddfc9de59cebaa3ae74688..7d7fc0bc857d39cd447f9669d1bd780e
  
      public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
-@@ -483,6 +484,7 @@ public class ServerPlayer extends Player {
+@@ -484,6 +485,7 @@ public class ServerPlayer extends Player {
              }
          }
  
@@ -60,7 +60,7 @@ index e9177d815c99450007ddfc9de59cebaa3ae74688..7d7fc0bc857d39cd447f9669d1bd780e
      }
  
      @Override
-@@ -543,6 +545,7 @@ public class ServerPlayer extends Player {
+@@ -544,6 +546,7 @@ public class ServerPlayer extends Player {
          }
          this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
  
@@ -68,7 +68,7 @@ index e9177d815c99450007ddfc9de59cebaa3ae74688..7d7fc0bc857d39cd447f9669d1bd780e
      }
  
      // CraftBukkit start - World fallback code, either respawn location or global spawn
-@@ -2618,5 +2621,13 @@ public class ServerPlayer extends Player {
+@@ -2619,5 +2622,13 @@ public class ServerPlayer extends Player {
              this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck);
          }
      }

patches/server/0137-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/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 7d7fc0bc857d39cd447f9669d1bd780e64846645..5d10e3f3990de7b3667de02cb515039bfbb6d815 100644
+index e1d9680a2d4ced9a51f47e20496868a0f052178d..1d256fa287334a9316b0caf8750a749e82797294 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1185,6 +1185,7 @@ public class ServerPlayer extends Player {
+@@ -1186,6 +1186,7 @@ public class ServerPlayer extends Player {
                  playerlist.sendPlayerPermissionLevel(this);
                  worldserver1.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
                  this.unsetRemoved();
@@ -17,7 +17,7 @@ index 7d7fc0bc857d39cd447f9669d1bd780e64846645..5d10e3f3990de7b3667de02cb515039b
                  // CraftBukkit end
                  this.setLevel(worldserver);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f5d9fe446de93e3b2c99198c6959280a1cf8443e..aa477068e28a4070a26aa08e09d614bbf6fd01ab 100644
+index 0f1e3ad781d47370237f6beb7681c3d40e7f7c2a..67fd63e8d3b87060ef7121aa223a75c81986e665 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2879,12 +2879,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0145-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/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5d10e3f3990de7b3667de02cb515039bfbb6d815..d732880ebed379bf6417bc59735093de010119a6 100644
+index 1d256fa287334a9316b0caf8750a749e82797294..880dbd0d1e2aaacbbc160e55ea51e92c8f1fb647 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1341,7 +1341,7 @@ public class ServerPlayer extends Player {
+@@ -1342,7 +1342,7 @@ public class ServerPlayer extends Player {
                              return entitymonster.isPreventingPlayerRest(this);
                          });
  

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

@@ -17,10 +17,10 @@ index 161a2b122843318a1bc411ea09ef83bc56bff0d1..fb1f9574235aec9e6b2e0fa289ce0853
                      // 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 c74e15d4776d98f288454eb609a798a183e51ee8..3927087d5cea154c2e8dba370fea47bdba65d05d 100644
+index 880dbd0d1e2aaacbbc160e55ea51e92c8f1fb647..edfcb6f0b500867899ee1323b8b9f971cf803bdc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -923,6 +923,7 @@ public class ServerPlayer extends Player {
+@@ -924,6 +924,7 @@ public class ServerPlayer extends Player {
              });
              Team scoreboardteambase = this.getTeam();
  
@@ -29,7 +29,7 @@ index c74e15d4776d98f288454eb609a798a183e51ee8..3927087d5cea154c2e8dba370fea47bd
                  if (scoreboardteambase.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) {
                      this.server.getPlayerList().broadcastSystemToTeam(this, ichatbasecomponent);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index ba5570a33768b114d2123cc828cd6e705c7e974b..01df902edf8cf11a6d66dcb6d5b59f633bc97f7a 100644
+index 94a1c3035462f9934a425ff996510d7d7a236f19..9f55711de82cf06d444aaa1757b72f13cd44de88 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -196,6 +196,18 @@ public class PurpurConfig {

patches/server/0212-Add-compass-command.patch

@@ -17,10 +17,10 @@ index 2fbb65c685ac88c77d54f27a5981a132fb44e370..d0ca327337206a64609c1b6ee652cf99
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index cc2b8be3eb4f51075784816a7696d2dca9ae6bea..b95685e13130a214165acccbe287c249ca73f1bf 100644
+index edfcb6f0b500867899ee1323b8b9f971cf803bdc..07f024636a8bf096c1922d18548263c778534bd4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -263,6 +263,7 @@ public class ServerPlayer extends Player {
+@@ -264,6 +264,7 @@ public class ServerPlayer extends Player {
      public boolean purpurClient = false; // Purpur
      public boolean acceptingResourcePack = false; // Purpur
      private boolean tpsBar = false; // Purpur
@@ -28,7 +28,7 @@ index cc2b8be3eb4f51075784816a7696d2dca9ae6bea..b95685e13130a214165acccbe287c249
  
      public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
-@@ -485,6 +486,7 @@ public class ServerPlayer extends Player {
+@@ -486,6 +487,7 @@ public class ServerPlayer extends Player {
          }
  
          if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur
@@ -36,7 +36,7 @@ index cc2b8be3eb4f51075784816a7696d2dca9ae6bea..b95685e13130a214165acccbe287c249
      }
  
      @Override
-@@ -546,6 +548,7 @@ public class ServerPlayer extends Player {
+@@ -547,6 +549,7 @@ public class ServerPlayer extends Player {
          this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
  
          nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
@@ -44,7 +44,7 @@ index cc2b8be3eb4f51075784816a7696d2dca9ae6bea..b95685e13130a214165acccbe287c249
      }
  
      // CraftBukkit start - World fallback code, either respawn location or global spawn
-@@ -2631,5 +2634,13 @@ public class ServerPlayer extends Player {
+@@ -2632,5 +2635,13 @@ public class ServerPlayer extends Player {
      public void tpsBar(boolean tpsBar) {
          this.tpsBar = tpsBar;
      }

patches/server/0240-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/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b95685e13130a214165acccbe287c249ca73f1bf..60873c874abbeff8f30b3536f5c4cc03e663530a 100644
+index 07f024636a8bf096c1922d18548263c778534bd4..f983d5739b46664f084d14a1b8a0e09efd1df999 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1516,6 +1516,7 @@ public class ServerPlayer extends Player {
+@@ -1517,6 +1517,7 @@ public class ServerPlayer extends Player {
  
      @Override
      public void openTextEdit(SignBlockEntity sign) {

patches/server/0284-Add-local-difficulty-api.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add local difficulty api
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 00fbf9ffdfa1c0d821ff86108c33e8b62a3d1268..295e3372d1e986549c96397c6ce26fb37e49f1ac 100644
+index a5d8dfc77475845be7c6d37eed04fb19eeef1c0c..0d428a9c6c8854a99f5f1a9860fe1a57c3fab392 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2234,6 +2234,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2235,6 +2235,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      public DragonBattle getEnderDragonBattle() {
          return (this.getHandle().dragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().dragonFight());
      }

patches/server/0291-Remove-Mojang-Profiler.patch

@@ -802,10 +802,10 @@ index ca733d97929c123df1234143660631eb07d62e79..655b9e8ffb941a0777f3895bf39c38fe
  
                  while (iterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 60873c874abbeff8f30b3536f5c4cc03e663530a..a8a3de5b23e4e5ce5d7d5bb84d85c3a7d62431ac 100644
+index f983d5739b46664f084d14a1b8a0e09efd1df999..73e150bd2a8cce3674887e1e8f8637de71631a53 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1154,7 +1154,7 @@ public class ServerPlayer extends Player {
+@@ -1155,7 +1155,7 @@ public class ServerPlayer extends Player {
              PortalInfo shapedetectorshape = this.findDimensionEntryPoint(worldserver);
  
              if (shapedetectorshape != null) {
@@ -814,7 +814,7 @@ index 60873c874abbeff8f30b3536f5c4cc03e663530a..a8a3de5b23e4e5ce5d7d5bb84d85c3a7
                  worldserver = shapedetectorshape.world; // CraftBukkit
                  if (worldserver == null) { } else // CraftBukkit - empty to fall through to null to event
                  if (resourcekey == LevelStem.OVERWORLD && worldserver.getTypeKey() == LevelStem.NETHER) { // CraftBukkit
-@@ -1177,8 +1177,8 @@ public class ServerPlayer extends Player {
+@@ -1178,8 +1178,8 @@ public class ServerPlayer extends Player {
              worldserver = ((CraftWorld) exit.getWorld()).getHandle();
              // CraftBukkit end
  
@@ -825,7 +825,7 @@ index 60873c874abbeff8f30b3536f5c4cc03e663530a..a8a3de5b23e4e5ce5d7d5bb84d85c3a7
              if (true) { // CraftBukkit
                  this.isChangingDimension = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
  
-@@ -1196,7 +1196,7 @@ public class ServerPlayer extends Player {
+@@ -1197,7 +1197,7 @@ public class ServerPlayer extends Player {
                  worldserver.addDuringPortalTeleport(this);
                  this.connection.teleport(exit); // CraftBukkit - use internal teleport without event
                  this.connection.resetPosition(); // CraftBukkit - sync position after changing it (from PortalTravelAgent#findAndteleport)
@@ -1061,7 +1061,7 @@ index 5725c6593480fada65facc29664a00a8cc073512..ccb1f998ae3122d1856d77149ff7e7df
              };
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ba4ff82c773b5c2ab46af13a467a7b36ba2bf63c..4e456c3c99d5203f48e921c38c38f9c6779581ad 100644
+index d05706583404bda548b955d996f38e73a7952776..553154e47a50615109ee70568c38dc1979d9ce98 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -821,7 +821,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {