diff --git a/gradle.properties b/gradle.properties
index 957f48685..eca91cfac 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19.4-R0.1-SNAPSHOT
 
-paperCommit = 6d2121efdeb15c5585f8fc0ce3841eb414a1eac6
+paperCommit = f7717c3712265fd480d6ff0ad808c430b9972004
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch
index 01c0394be..85ad3a76e 100644
--- a/patches/server/0001-Pufferfish-Server-Changes.patch
+++ b/patches/server/0001-Pufferfish-Server-Changes.patch
@@ -3034,7 +3034,7 @@ index a71414397bd45ee7bcacfeef0041d80dfa25f114..d66806565770cb03a21794f99e5c4b0f
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index cba114f554644a37339c93026630c66c43f524b9..746b71ea96ecc441afd45cc779a1777c15d58ff2 100644
+index aac5572c1d40a10cd1d17f89c9eb836718837577..9b506bd2ec6e7fd1893dc7801592f011680028d7 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 @@ -47,7 +47,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -3431,7 +3431,7 @@ index ebe65474a4a05ff1637d7f37ebcfe690af59def5..42142c512b12e5b269c19f1e821c50e7
  
      @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0ba8446065def1b120fd73241de5bc14d60d3b82..58eaa1142bb0568bef439bba76903309914d3ae1 100644
+index e90e7f32c81ac2ffdb7594fa3e4623061304409e..482420c38e8fd1abc261daeabce76091f1e0ff3c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -256,7 +256,7 @@ import javax.annotation.Nullable; // Paper
@@ -3443,8 +3443,8 @@ index 0ba8446065def1b120fd73241de5bc14d60d3b82..58eaa1142bb0568bef439bba76903309
      private final String serverVersion;
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
-@@ -1043,6 +1043,11 @@ public final class CraftServer implements Server {
-                 plugin.getDescription().getName(),
+@@ -1039,6 +1039,11 @@ public final class CraftServer implements Server {
+                 plugin.getPluginMeta().getDisplayName(),
                  "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."
              ));
 +            getLogger().log(Level.SEVERE, String.format("%s Stacktrace", worker.getThread().getName()));
diff --git a/patches/server/0004-Purpur-config-files.patch b/patches/server/0004-Purpur-config-files.patch
index 4e1c4da94..e7c3a50bd 100644
--- a/patches/server/0004-Purpur-config-files.patch
+++ b/patches/server/0004-Purpur-config-files.patch
@@ -112,7 +112,7 @@ index 66cc44d9f14b01f6c8e53b0f990866ac897c1c81..c38aff50c6f0bc37e539bb4d5206f7b6
          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 430df6a2b852f07e3a1cd9dfcd5ecf3e52e63b66..6f59ff3dda4adaa24065ac388c8de556f3934313 100644
+index 740bc3aaac6ce4f642e16c339bd7e8de706cbf09..0c2aa1408d8220b9d3369d8b0b39eb5769dd376e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -956,6 +956,7 @@ public final class CraftServer implements Server {
@@ -139,7 +139,7 @@ index 430df6a2b852f07e3a1cd9dfcd5ecf3e52e63b66..6f59ff3dda4adaa24065ac388c8de556
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2749,6 +2752,18 @@ public final class CraftServer implements Server {
+@@ -2745,6 +2748,18 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
  
@@ -159,7 +159,7 @@ index 430df6a2b852f07e3a1cd9dfcd5ecf3e52e63b66..6f59ff3dda4adaa24065ac388c8de556
          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 4966a1e3dd35357a8ea6a7d2944c84c9c3e9058e..f5266df43726a7805ee2664ed18a2dcf79ab6cde 100644
+index 755c223ab2a046285eb9916b6195093714f4c5ba..5758ce3033c2d4121970eb8757beabc1975c5c83 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -173,6 +173,14 @@ public class Main {
diff --git a/patches/server/0013-Bring-back-server-name.patch b/patches/server/0013-Bring-back-server-name.patch
index bcaaf4ea5..e2927069f 100644
--- a/patches/server/0013-Bring-back-server-name.patch
+++ b/patches/server/0013-Bring-back-server-name.patch
@@ -17,10 +17,10 @@ index 818289e831e3dad29345c43265e2efd7689bc500..1ea3012995c738c67b31e997c138f824
      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 6f59ff3dda4adaa24065ac388c8de556f3934313..3ed3375c327f426c8e20efde000806a8b4bfa24d 100644
+index 0c2aa1408d8220b9d3369d8b0b39eb5769dd376e..3c7ef6dc1306c144de74cd540d509f67716ff434 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2939,4 +2939,11 @@ public final class CraftServer implements Server {
+@@ -2935,4 +2935,11 @@ public final class CraftServer implements Server {
      }
  
      // Paper end
diff --git a/patches/server/0016-Lagging-threshold.patch b/patches/server/0016-Lagging-threshold.patch
index ef465bdec..37c789648 100644
--- a/patches/server/0016-Lagging-threshold.patch
+++ b/patches/server/0016-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 d728e115c57ecf26c960e5130135c8875007dd48..c4f8caf7001bb022117466ce723a9ac3ada03d6b 100644
+index 57f6de7872bfa80cf7668524975946cbd7fcda56..6cdcd4f105b15f10d60499572f6f4f830565513e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -309,6 +309,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -25,10 +25,10 @@ index d728e115c57ecf26c960e5130135c8875007dd48..c4f8caf7001bb022117466ce723a9ac3
                  }
                  // Spigot end
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3ed3375c327f426c8e20efde000806a8b4bfa24d..c6067c4446ee5c531bc2c855ebd0c9cb2e3dada8 100644
+index 3c7ef6dc1306c144de74cd540d509f67716ff434..9c949e2e7d2d25f0012b3e7bc2e054cac42230a3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2945,5 +2945,10 @@ public final class CraftServer implements Server {
+@@ -2941,5 +2941,10 @@ public final class CraftServer implements Server {
      public String getServerName() {
          return this.getProperties().serverName;
      }
diff --git a/patches/server/0061-Add-5-second-tps-average-in-tps.patch b/patches/server/0061-Add-5-second-tps-average-in-tps.patch
index e70a1dde3..b28588cec 100644
--- a/patches/server/0061-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0061-Add-5-second-tps-average-in-tps.patch
@@ -69,10 +69,10 @@ index ceaafede643bac0b6714df3d5475b4cb03b2eaed..65ba915d3644b638ce3b5314c0aed5b2
                          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 5a3b852b396367d32fa9de003dfdb1890a86beed..471a867b9734e6fb9735c17b06c1daf844657c50 100644
+index 9c949e2e7d2d25f0012b3e7bc2e054cac42230a3..4df7b6ccb7d130f11d219ca4857604c753f3007c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2706,6 +2706,7 @@ public final class CraftServer implements Server {
+@@ -2702,6 +2702,7 @@ public final class CraftServer implements Server {
      @Override
      public double[] getTPS() {
          return new double[] {
diff --git a/patches/server/0215-Added-the-ability-to-add-combustible-items.patch b/patches/server/0215-Added-the-ability-to-add-combustible-items.patch
index 77104b82e..90b7bccd0 100644
--- a/patches/server/0215-Added-the-ability-to-add-combustible-items.patch
+++ b/patches/server/0215-Added-the-ability-to-add-combustible-items.patch
@@ -51,10 +51,10 @@ index 4ff472f454b60c3608286b7553926acf74069b73..5cd7b4e7065070bf9fcc34b621dba2cc
      private int maxStack = MAX_STACK;
      public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 471a867b9734e6fb9735c17b06c1daf844657c50..09c827d21581318f282a9a17a8f8f95d26d4d1d0 100644
+index 4df7b6ccb7d130f11d219ca4857604c753f3007c..d7d6891e4cffd84409bbb00cfc35868dd282e2bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1435,6 +1435,19 @@ public final class CraftServer implements Server {
+@@ -1431,6 +1431,19 @@ public final class CraftServer implements Server {
          return true;
      }
  
diff --git a/patches/server/0279-Debug-Marker-API.patch b/patches/server/0279-Debug-Marker-API.patch
index 55667faab..a51d5d22b 100644
--- a/patches/server/0279-Debug-Marker-API.patch
+++ b/patches/server/0279-Debug-Marker-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Debug Marker API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 09c827d21581318f282a9a17a8f8f95d26d4d1d0..5e7162866530c323f50ea99183757622cc6b2b97 100644
+index d7d6891e4cffd84409bbb00cfc35868dd282e2bc..d3df075bd335435738d9718b7d3625233f2a5110 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1446,6 +1446,42 @@ public final class CraftServer implements Server {
+@@ -1442,6 +1442,42 @@ public final class CraftServer implements Server {
      public void removeFuel(org.bukkit.Material material) {
          net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity.removeFuel(net.minecraft.world.item.ItemStack.fromBukkitCopy(new ItemStack(material)));
      }