Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@3aec863 Add BlockLockCheckEvent (#7840)
PaperMC/Paper@0262de0 Deprecate TargetBlock/EntityInfo and assocated methods (#7381)
PaperMC/Paper@28c7d40 Add Sneaking API for Entities (#8485)
PaperMC/Paper@262c08f Updated Upstream (CraftBukkit) (#8680)

gradle.properties

@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19.3-R0.1-SNAPSHOT
 
-paperCommit = 20503beee52dc56d3f6e00707ee621413e100a11
+paperCommit = 262c08f64fd4cd055a6e0f1f9b866624f3a36b59
 
 org.gradle.caching = true
 org.gradle.parallel = true

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 19995314b01f19c312efa2a4584ccfba2d700c52..8c44c6e41a1751acf417c4d26c6335139fa6d36d 100644
+index 9f762cf670bf5db9138e468e72e57781d8d22f54..b3e2e4a778c94137539c3bcce4a4e0f7c8b3a098 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2901,4 +2901,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2903,4 +2903,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end

patches/api/0007-Ridables.patch

@@ -22,10 +22,10 @@ index 998f629852e1103767e005405d1f39c2251ecd28..49cba8a3226e4e2f2b11f3171c29e975
       * @deprecated removed in 1.16
       */
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 33a6b7a27dc91552799c07a7aad9b3df31ad13f7..83c74245e75b8895404fe4b7214c686a308e00b5 100644
+index cdbc7329cf5f67d66e31eb31e83b9e7997040f72..56afcc92854897ad5c971e576f96414bae766b7a 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -951,4 +951,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -970,4 +970,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      boolean wouldCollideUsing(@NotNull BoundingBox boundingBox);
      // Paper End - Collision API

patches/api/0010-AFK-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8c44c6e41a1751acf417c4d26c6335139fa6d36d..1aafdd20390a33298e154de5798cf4d0f5d2c022 100644
+index b3e2e4a778c94137539c3bcce4a4e0f7c8b3a098..28d0c2a554ced153b508bea57cfc3ec92b85cc12 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2909,5 +2909,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2911,5 +2911,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @return True if Player uses Purpur Client
       */
      public boolean usesPurpurClient();

patches/api/0013-LivingEntity-safeFallDistance.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity safeFallDistance
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 97336be470a9d545d93f78e683a793f328013ad8..ce3a648542d7bcccefe3a505f79a62e88be878e7 100644
+index ead90b002034c463983af948a4fb882109b8d3a2..cb45f3ae2b13ec13e02a931dd870e86c5eabf6c9 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1059,4 +1059,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1107,4 +1107,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      void damageItemStack(org.bukkit.inventory.@NotNull EquipmentSlot slot, int amount);
      // Paper end

patches/api/0017-Player-invulnerabilities.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 1aafdd20390a33298e154de5798cf4d0f5d2c022..e349de85d5e3733cdaf564f3ff29c23bd92405d3 100644
+index 28d0c2a554ced153b508bea57cfc3ec92b85cc12..d9afdcfebb3fa095bd82fb12d5d6836f2ed7741d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2928,5 +2928,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2930,5 +2930,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Reset the idle timer back to 0
       */
      void resetIdleTimer();

patches/api/0022-LivingEntity-broadcastItemBreak.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index ce3a648542d7bcccefe3a505f79a62e88be878e7..bb363d8c651393ee9845bcbd6a95c9d57e1cfcbb 100644
+index cb45f3ae2b13ec13e02a931dd870e86c5eabf6c9..a4fbc1f6f71759ed9e11b4487aff04961946b7d8 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1074,5 +1074,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1122,5 +1122,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param safeFallDistance Safe fall distance
       */
      void setSafeFallDistance(float safeFallDistance);

patches/api/0034-API-for-any-mob-to-burn-daylight.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight
 Co-authored by: Encode42 <me@encode42.dev>
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 83c74245e75b8895404fe4b7214c686a308e00b5..28be71aa677ed8cb9a9d06b3aba7af40f0992f68 100644
+index 56afcc92854897ad5c971e576f96414bae766b7a..d8f30fca0b5b9673c5dd8a78e87a378c60d04067 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -981,5 +981,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1000,5 +1000,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       * @return True if ridable in water
       */
      boolean isRidableInWater();
@@ -23,10 +23,10 @@ index 83c74245e75b8895404fe4b7214c686a308e00b5..28be71aa677ed8cb9a9d06b3aba7af40
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index bb363d8c651393ee9845bcbd6a95c9d57e1cfcbb..1da4521fe1930ce66e4d9931d059282d3a66e20d 100644
+index a4fbc1f6f71759ed9e11b4487aff04961946b7d8..d1379d8eee19bcef3b9ffa7c86961f9ce57f76ad 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1081,5 +1081,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1129,5 +1129,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param slot Equipment slot to play break animation for
       */
      void broadcastItemBreak(@NotNull org.bukkit.inventory.EquipmentSlot slot);

patches/api/0035-Flying-Fall-Damage-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Flying Fall Damage API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index e349de85d5e3733cdaf564f3ff29c23bd92405d3..9d67c03f6afa5bc9b4ea35399e4fbb9d96bbed68 100644
+index d9afdcfebb3fa095bd82fb12d5d6836f2ed7741d..d76b996e8820e043b85fa5338a837e1a4f196e08 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2949,5 +2949,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2951,5 +2951,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param invulnerableTicks Invulnerable ticks remaining
       */
      void setSpawnInvulnerableTicks(int invulnerableTicks);

patches/api/0050-Debug-Marker-API.patch

@@ -260,10 +260,10 @@ index 8effbbd33c0af0ac421e5aef1586e8579ef097e4..0cd49cb31b21e52009f6220d505aa2a3
 
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9d67c03f6afa5bc9b4ea35399e4fbb9d96bbed68..d02953cd68f7161eba76752dfe1d3282367f2dfd 100644
+index d76b996e8820e043b85fa5338a837e1a4f196e08..6782a41eb845c69e9749e340d9fe8d6402caecc2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2963,5 +2963,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2965,5 +2965,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @return True if fall damage is enabled when {@link #getAllowFlight()} is true
       */
      public boolean hasFlyingFallDamage();

patches/api/0051-add-Player-showCreditScreen.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] add Player#showCreditScreen
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d02953cd68f7161eba76752dfe1d3282367f2dfd..a1e8bee97d0eae927e2a3ad66592d6c78acb6471 100644
+index 6782a41eb845c69e9749e340d9fe8d6402caecc2..faa2954f68cf5c675e732bd1c6b456321ccb2ec2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2409,6 +2409,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2411,6 +2411,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void showDemoScreen();
 

patches/api/0052-Add-death-screen-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a1e8bee97d0eae927e2a3ad66592d6c78acb6471..35bff85031b1e1b06af7d2bc1c76540d17ae3f3e 100644
+index faa2954f68cf5c675e732bd1c6b456321ccb2ec2..18b8b0ee95216c7168d2502c901319f450e6e276 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3041,5 +3041,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3043,5 +3043,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Clears all debug block highlights
       */
      void clearBlockHighlights();

patches/api/0056-Fire-Immunity-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fire Immunity API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 28be71aa677ed8cb9a9d06b3aba7af40f0992f68..3959765b110b6fed91348c11ff85e302a885776c 100644
+index d8f30fca0b5b9673c5dd8a78e87a378c60d04067..8a980916176b2179168833f1d14872176837154e 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -988,5 +988,18 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1007,5 +1007,18 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       * @return True if in daylight
       */
      boolean isInDaylight();

patches/server/0003-Rebrand.patch

@@ -212,7 +212,7 @@ index 673fb3955291407be37dc78be4eec9bf2018128b..c3221e8088bc53c8c229961adecbf602
              // Spigot end
              DedicatedServer.LOGGER.warn("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 098b67e6ad74be7698713623ca7fae70f19ac6b3..57a2014ff63129e99acdf8c382f3c4665e14cdd6 100644
+index 277e8a03ab270eabb6b8c31d0076f3310c91eef2..b4f186fdcb8e6b5ebd9d506e9ded65e22e78ee0d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -261,7 +261,7 @@ import javax.annotation.Nullable; // Paper
@@ -252,10 +252,10 @@ index 4e56018b64d11f76c8da43fd8f85c6de72204e36..aa8212432825db65cf485cd93f734ccd
 
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 316120a57802c45fb9b02a4daee207a0845c63be..e3c1a7f7e643b8a2f42e76c92087219f984ea8aa 100644
+index 09da9d3c85e36c2a78663f58a97963dbc795a367..e1b873404c5f58ea678b12a762f98fb62a1c4ab7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -866,7 +866,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -877,7 +877,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
              return EntityCategory.WATER;
          }
 

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

@@ -105,7 +105,7 @@ index 42299fd6ae663b01bb5f010b96887caa744dcb96..816f906f98adc180f37d2b216628e576
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 57a2014ff63129e99acdf8c382f3c4665e14cdd6..fb290333f407776e732d3588233a35afa2ab989c 100644
+index b4f186fdcb8e6b5ebd9d506e9ded65e22e78ee0d..7d97c45ee5bf9cbb17f3d8658ab43e18c21bd7ff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -979,6 +979,7 @@ public final class CraftServer implements Server {
@@ -132,7 +132,7 @@ index 57a2014ff63129e99acdf8c382f3c4665e14cdd6..fb290333f407776e732d3588233a35af
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
 
-@@ -2765,6 +2768,18 @@ public final class CraftServer implements Server {
+@@ -2768,6 +2771,18 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
 

patches/server/0008-Ridables.patch

@@ -202,7 +202,7 @@ index c1e9b40a4a0f9cdc650caa88b5ea132e06ee2496..882ab40c8cdea8c214cb8344b3ccecdd
      protected ParticleOptions getInkParticle() {
          return ParticleTypes.GLOW_SQUID_INK;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d134e88ae9aa2bd0b2b51056bfcc37941c713002..60519f70115358e3f94de6a2c1923e2d5f7a9f55 100644
+index cde8e5a5c2bd3e0bb7359d2638ebc9b5ca7a531d..f5107607fbc19dd0348f2bf8df4fa1748646686e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -221,9 +221,9 @@ public abstract class LivingEntity extends Entity {
@@ -5152,10 +5152,10 @@ index 4132c1113f5437a776e5e3c1cb306904775aed88..1a945a32c3d3705a318ebca72a365931
      public void tick() {
          super.tick();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 6cd6cb256bde958416a0e4b13fc1d3df74f230fd..3ac836bd6fccf66771dc0141b9b6a25da9837211 100644
+index 78f53ee557276de85f0431ebcb146445b1f4fb92..ba898640a8f693e8bae43281b170d3505154b273 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1392,4 +1392,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1404,4 +1404,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return !this.getHandle().level.noCollision(this.getHandle(), aabb);
      }
      // Paper End - Collision API

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

@@ -17,10 +17,10 @@ index c7e4330c93baff1f3027d7c75cf857b673d38970..5134fed0cd0eedbe0c2177bce91b978b
      public final boolean spawnNpcs = this.get("spawn-npcs", true);
      public final boolean pvp = this.get("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fb290333f407776e732d3588233a35afa2ab989c..4a3025635de5f5f889e642fe10dd0b7ba7ec39d2 100644
+index 7d97c45ee5bf9cbb17f3d8658ab43e18c21bd7ff..e33bf6cb8a87717af24515fb0ce9f2bb8139eecd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2955,4 +2955,11 @@ public final class CraftServer implements Server {
+@@ -2958,4 +2958,11 @@ public final class CraftServer implements Server {
      }
 
      // Paper end

patches/server/0015-LivingEntity-safeFallDistance.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity safeFallDistance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a24bffefc209ebfe31e553ceef212615edeb2687..2dacb572e2164ccd381c4e3cbc39d9238a89f500 100644
+index 60d8052390a3a6fde05fb19896f8b8047f2c9178..38352df039574b7fec428ab910e484a7f267bfbe 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -256,6 +256,7 @@ public abstract class LivingEntity extends Entity {
@@ -62,10 +62,10 @@ index 8b1942b396606f0c989645a6ac587fbdd26a3dc5..c1c5e884f00398032196ee71b55b348f
 
      // Purpur start
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index e3c1a7f7e643b8a2f42e76c92087219f984ea8aa..810e13a060a7c64f8d0d08a632b378ef8480710e 100644
+index e1b873404c5f58ea678b12a762f98fb62a1c4ab7..dd12931ac3b3cbb27a6ead1f8399631fb8be1780 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1043,4 +1043,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1054,4 +1054,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          getHandle().knockback(strength, directionX, directionZ);
      };
      // Paper end

patches/server/0016-Lagging-threshold.patch

@@ -25,10 +25,10 @@ index 70d3fc30e21a6c3c3d7a87ce2e43dd2eb8322b2c..7c731c72a19c43f4b291557310c632f3
                  }
                  // Spigot end
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4a3025635de5f5f889e642fe10dd0b7ba7ec39d2..b95002c01d8f6f4013708a21a44ef8dcd3653887 100644
+index e33bf6cb8a87717af24515fb0ce9f2bb8139eecd..26fafaf636f98d15676d3ec2a7cbc61420da67d1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2961,5 +2961,10 @@ public final class CraftServer implements Server {
+@@ -2964,5 +2964,10 @@ public final class CraftServer implements Server {
      public String getServerName() {
          return this.getProperties().serverName;
      }

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

@@ -69,10 +69,10 @@ index 779d14840fdb0b27e1bb49e680c59539294b2995..96f50760dec9fb7ec317b500ce5cd6a6
                          lagging = recentTps[0] < org.purpurmc.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 b95002c01d8f6f4013708a21a44ef8dcd3653887..63f0e6ae798f04784ee0e1ce1a24b7c2f7b3db27 100644
+index 26fafaf636f98d15676d3ec2a7cbc61420da67d1..7803c13ed23c6840c400b4f2e983ede7a0b43de0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2722,6 +2722,7 @@ public final class CraftServer implements Server {
+@@ -2725,6 +2725,7 @@ public final class CraftServer implements Server {
      @Override
      public double[] getTPS() {
          return new double[] {

patches/server/0091-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 810e13a060a7c64f8d0d08a632b378ef8480710e..bea0a1441b3f331e1bbaee15a91b279950bca640 100644
+index dd12931ac3b3cbb27a6ead1f8399631fb8be1780..082510cfd3c371a55c19e633db4184fc9c5ee309 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1054,5 +1054,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1065,5 +1065,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setSafeFallDistance(float safeFallDistance) {
          getHandle().safeFallDistance = safeFallDistance;
      }