Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@06fdc02 [ci skip] Correct upstream/paper javadoc (#8286)
PaperMC/Paper@11ab383 Don't use plugin-profiling to enable timings

gradle.properties

@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19.4-R0.1-SNAPSHOT
 
-paperCommit = bf92f3e4db44d17dab7411b0a5474a6b2fabc3b5
+paperCommit = 11ab383e4fb546c8e35b634daa51cfda520b5e70
 
 org.gradle.caching = true
 org.gradle.parallel = true

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 2204336d8800311b65e894739ab1b27273e7c6f2..bd749cfa7b0b0f08f63dd125e7d82a0b0bd232eb 100644
+index 8621dba7f10ab822b5b99ce0d05da58823605cb6..2c989eda18c0aa67eb552fe38b6482e91887d5e5 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1971,6 +1971,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1968,6 +1968,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Paper end
  

patches/api/0011-Bring-back-server-name.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ac9b690fcccb60b587e5345f12f1383afd0a73a1..d0b36ad1492ce00d89a5cac123985328ecb77a5a 100644
+index f1af93319d6b29d7bc709e7e273e8abe26c7b4af..5c581193cad7a80056b63fc0406001ec4a0c37ed 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2464,4 +2464,15 @@ public final class Bukkit {
+@@ -2461,4 +2461,15 @@ public final class Bukkit {
      public static Server.Spigot spigot() {
          return server.spigot();
      }
@@ -25,10 +25,10 @@ index ac9b690fcccb60b587e5345f12f1383afd0a73a1..d0b36ad1492ce00d89a5cac123985328
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index bd749cfa7b0b0f08f63dd125e7d82a0b0bd232eb..c21d840f8874409651146b717fd122e10d882464 100644
+index 2c989eda18c0aa67eb552fe38b6482e91887d5e5..3e4ddcc1320eff2be4539f134f15951aaa4fcc8a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2151,4 +2151,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2148,4 +2148,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
      // Paper end

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 059dfc40edc6c52f95a30e9ac72f45b6aaf5f9a8..2bcf281053b1482a8d60d50fd231006659f7b651 100644
+index ffca32ae2464ea5a669029079a50585ca259a4f8..7e60e848c8609cf41603a25ea42927896b56390f 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1148,4 +1148,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1150,4 +1150,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      void setBodyYaw(float bodyYaw);
      // Paper end

patches/api/0014-Lagging-threshold.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index d0b36ad1492ce00d89a5cac123985328ecb77a5a..731aaf6090d0ea6c5a4cc40e03067456a12ffb6f 100644
+index 5c581193cad7a80056b63fc0406001ec4a0c37ed..29f98336de10e2af1ef15d0f0d29796076d008e1 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2474,5 +2474,14 @@ public final class Bukkit {
+@@ -2471,5 +2471,14 @@ public final class Bukkit {
      public static String getServerName() {
          return server.getServerName();
      }
@@ -24,10 +24,10 @@ index d0b36ad1492ce00d89a5cac123985328ecb77a5a..731aaf6090d0ea6c5a4cc40e03067456
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c21d840f8874409651146b717fd122e10d882464..ee0e26ffc49088011e06489684a2bfce486648ba 100644
+index 3e4ddcc1320eff2be4539f134f15951aaa4fcc8a..d6f126d4f9f84c013b4c9320a38a66c6bab12d8c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2159,5 +2159,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2156,5 +2156,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      String getServerName();

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 2bcf281053b1482a8d60d50fd231006659f7b651..ed6bc6bc206d2742c96e80a10efc46e2f5206666 100644
+index 7e60e848c8609cf41603a25ea42927896b56390f..1ea02330f16881892a7dc70fd8ecb27ada464b8b 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1163,5 +1163,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1165,5 +1165,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param safeFallDistance Safe fall distance
       */
      void setSafeFallDistance(float safeFallDistance);

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

@@ -6,7 +6,7 @@ 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 1087d6fa472878a6648310543746c78eae08a22c..4fb8bf49edbc49f7238932eb661816152cbd05dc 100644
+index 3bc677486e699e168891663a5904875036c29fca..ddaa8eac7d32895e235e435db6d78b06a28cec97 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -983,5 +983,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -23,10 +23,10 @@ index 1087d6fa472878a6648310543746c78eae08a22c..4fb8bf49edbc49f7238932eb66181615
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index ed6bc6bc206d2742c96e80a10efc46e2f5206666..216ad2cf780cc432e85cd59a8cd8deb33b701a70 100644
+index 1ea02330f16881892a7dc70fd8ecb27ada464b8b..654dc0c6d98b29cf45d3826aece374726e3e9802 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1170,5 +1170,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1172,5 +1172,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/0038-Added-the-ability-to-add-combustible-items.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Added the ability to add combustible items
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 731aaf6090d0ea6c5a4cc40e03067456a12ffb6f..9ea6210439d680d550b661783874e21cd92b6422 100644
+index 29f98336de10e2af1ef15d0f0d29796076d008e1..83e1360397ec257719c0e1f8734d57daece76a0e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2483,5 +2483,24 @@ public final class Bukkit {
+@@ -2480,5 +2480,24 @@ public final class Bukkit {
      public static boolean isLagging() {
          return server.isLagging();
      }
@@ -34,10 +34,10 @@ index 731aaf6090d0ea6c5a4cc40e03067456a12ffb6f..9ea6210439d680d550b661783874e21c
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index ee0e26ffc49088011e06489684a2bfce486648ba..2b64836fcfd22c7b11030aca4de44784440e285b 100644
+index d6f126d4f9f84c013b4c9320a38a66c6bab12d8c..b2184f33f8b34ae484357742690e205accaa635f 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2166,5 +2166,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2163,5 +2163,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return True if lagging
       */
      boolean isLagging();

patches/api/0043-Add-local-difficulty-api.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add local difficulty api
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index aa04d7df70d99402c91e920fd693d7d4fb655786..bb249f7d54fd90d63f609eedf0bbb463f1aa96f1 100644
+index 6716a1185e733f3ddf56b295f3153938f57d4229..b19264c7584441422b85c7a68d857f2bd314f140 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4010,6 +4010,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4007,6 +4007,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      public DragonBattle getEnderDragonBattle();
  

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Debug Marker API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 9ea6210439d680d550b661783874e21cd92b6422..83571abfe9a2eb8736b481de35dfd7fd4c663f5a 100644
+index 83e1360397ec257719c0e1f8734d57daece76a0e..78a9155e78178f1cc8da2a2d42fd3276565030f5 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2502,5 +2502,89 @@ public final class Bukkit {
+@@ -2499,5 +2499,89 @@ public final class Bukkit {
      public static void removeFuel(@NotNull Material material) {
          server.removeFuel(material);
      }
@@ -99,10 +99,10 @@ index 9ea6210439d680d550b661783874e21cd92b6422..83571abfe9a2eb8736b481de35dfd7fd
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 2b64836fcfd22c7b11030aca4de44784440e285b..e0f69edf603c2ec99bc92b16b18912272cc41bd9 100644
+index b2184f33f8b34ae484357742690e205accaa635f..730caafaf9629664ba125f3884559da76616f655 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2181,5 +2181,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2178,5 +2178,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @param material The material that will no longer be a fuel
       */
      public void removeFuel(@NotNull Material material);
@@ -179,10 +179,10 @@ index 2b64836fcfd22c7b11030aca4de44784440e285b..e0f69edf603c2ec99bc92b16b1891227
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index bb249f7d54fd90d63f609eedf0bbb463f1aa96f1..a38863ebd363f54994753937a10e041076846af0 100644
+index b19264c7584441422b85c7a68d857f2bd314f140..ad00e30379df52575bf2697ccb32abb176ecd47a 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4018,6 +4018,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4015,6 +4015,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
       * @return The local difficulty
       */
      public float getLocalDifficultyAt(@NotNull Location location);
@@ -260,7 +260,7 @@ index bb249f7d54fd90d63f609eedf0bbb463f1aa96f1..a38863ebd363f54994753937a10e0410
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 819aa1f1e2c2c32510973e6fc9d8561366230851..12b659d13ce336cca52dd704caa7c20366cfe6d9 100644
+index 424774d4b27d963cbd346026cb391b994f9c8c64..a5ba90c55cb22d92cdf3148570658cb653bcb022 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3048,5 +3048,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM