diff --git a/gradle.properties b/gradle.properties
index 97a214c48..e300b7af6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19-R0.1-SNAPSHOT
 
-paperCommit = cd215af6eb784724868ea0d276e6cc0f06fc2624
+paperCommit = 036a09c30024d620d90b1917154e51fcbef69c60
 
 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 a783cf6e3..3aa26730c 100644
--- a/patches/server/0001-Pufferfish-Server-Changes.patch
+++ b/patches/server/0001-Pufferfish-Server-Changes.patch
@@ -1096,7 +1096,7 @@ index 0000000000000000000000000000000000000000..e877921370f6009a4bd204d9b17d2d58
 \ No newline at end of file
 diff --git a/src/main/java/gg/pufferfish/pufferfish/compat/ServerConfigurations.java b/src/main/java/gg/pufferfish/pufferfish/compat/ServerConfigurations.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..f0ec1f3944c00d38537f6f3b3f13236b22562458
+index 0000000000000000000000000000000000000000..4ad189d52b27560424ddb311d0817a334637dc95
 --- /dev/null
 +++ b/src/main/java/gg/pufferfish/pufferfish/compat/ServerConfigurations.java
 @@ -0,0 +1,78 @@
@@ -1125,7 +1125,7 @@ index 0000000000000000000000000000000000000000..f0ec1f3944c00d38537f6f3b3f13236b
 +      "server.properties",
 +      "bukkit.yml",
 +      "spigot.yml",
-+      "paper.yml",
++      // "paper.yml", // TODO: Figure out what to do with this.
 +      "pufferfish.yml"
 +    };
 +
@@ -2227,7 +2227,7 @@ index a934226dc9a273fac03c21227f7ef3d50ea080c4..7fd7c3be306d93201a61bb616f8c09cb
      }
  
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index aea18838a17fc52e1bf8cd84cd185565e6e2246d..5d6ceeecfbb55a1bfe77a1f1ac39b02993e714e3 100644
+index b42327dcf0cc9feaf4fdb67de949dd36cf71bbaa..ad166788225841927bedc5243dbe94863c270425 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -226,6 +226,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -2473,7 +2473,7 @@ index 1a918eabbaaed26d9bdf5c01e0488b5a117ba516..32a39a150a3d2bbae95a726901f3f463
              this.getRandomBlockPosition(j, 0, k, 15, blockposition);
              int normalY = chunk.getHeight(Heightmap.Types.MOTION_BLOCKING, blockposition.getX() & 15, blockposition.getZ() & 15) + 1;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6f2006c53a27531ab04a95e446e30d85eb422970..d42e220347cb39d7f0e04f9f47403bb1914e164d 100644
+index f342043f4a8aef7e757571ead0e0218fe7e5ee58..0960025c64fe2e8c055fcbf6e695ff90c1f41cd9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1149,6 +1149,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser