diff --git a/gradle.properties b/gradle.properties
index 5b618226..f7f6f687 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,4 +4,4 @@ version = 1.19-R0.1-SNAPSHOT
 mcVersion = 1.19
 packageVersion = 1_19_R0
 org.gradle.jvmargs=-Xmx2G
-paperRef=b7faa655cb617549a3437f33c353cbaddb1746ff
+paperRef=86f87ba40030d719e5fb8840ab18c513588de772
diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
index 86b5b79f..61cbf8de 100644
--- a/patches/server/0001-Build-changes.patch
+++ b/patches/server/0001-Build-changes.patch
@@ -71,10 +71,10 @@ index 7b1843e16745ca8db2244e17490d291401f22679..0ac8bcb0a4b7d1da3d0e016617db7a81
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a934226dc9a273fac03c21227f7ef3d50ea080c4..c2a521c546089e33ef08f0874b50072152ba8bb0 100644
+index 35a5cc8ed861401d3dd28b08ebc5d40aad82b0df..e137e18cdca9fd3d1add500a178459a93465e789 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1654,7 +1654,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1655,7 +1655,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
@@ -84,7 +84,7 @@ index a934226dc9a273fac03c21227f7ef3d50ea080c4..c2a521c546089e33ef08f0874b500721
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a8cf1ab9d7504dfdb2310f1dca82324a225bea7d..767865120ed6bc4bd5fcc0ff793223edf946ea42 100644
+index bfde5bbcccfaa754ec6bdf4f3817981a93e465bd..b64c470234c8f50f1cfb83bf6d2efb5038eae45b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -246,7 +246,7 @@ import javax.annotation.Nullable; // Paper
diff --git a/patches/server/0003-Leaves-Server-Config.patch b/patches/server/0003-Leaves-Server-Config.patch
index 6f9f672a..d04de147 100644
--- a/patches/server/0003-Leaves-Server-Config.patch
+++ b/patches/server/0003-Leaves-Server-Config.patch
@@ -19,10 +19,10 @@ index 06bff37e4c1fddd3be6343049a66787c63fb420c..15ed5a9af5583e2430804662e3b9fa95
  
          new TimingsExport(listeners, parent, history).start();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c2a521c546089e33ef08f0874b50072152ba8bb0..83a38995f63c855892fdf7e6c05ad789af1d4a83 100644
+index e137e18cdca9fd3d1add500a178459a93465e789..130147d9423267a675ac5a824ee8de14e2195a0e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1140,6 +1140,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1141,6 +1141,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              LOGGER.info("Done ({})! For help, type \"help\"", doneTime);
              // Paper end
  
@@ -64,7 +64,7 @@ index 9467ccaa1d73e1913495a46919aee530e749977d..4ea3b42c62b657ba386c9dca3d2afe5c
          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 767865120ed6bc4bd5fcc0ff793223edf946ea42..244c76dc3d91e4240b072c1d3077a8e0aa4dc47d 100644
+index b64c470234c8f50f1cfb83bf6d2efb5038eae45b..599ad9516e9642f774c4f8b1d60b453a775b172a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -959,6 +959,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0004-Fix-gravity-block-duper.patch b/patches/server/0004-Fix-gravity-block-duper.patch
index 8c4430a1..e48cb200 100644
--- a/patches/server/0004-Fix-gravity-block-duper.patch
+++ b/patches/server/0004-Fix-gravity-block-duper.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix gravity block duper
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 19a64b582bc042e426220e080d9c21b3a82cf3f7..ed12788bcff923986fde022883e7123301dc57f5 100644
+index 99f454b4a3a12fb9bf8e1d506ab311e4166700da..e09a44bfec96bce3e6a5c64040860a391e6da65c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -460,36 +460,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -46,7 +46,7 @@ index 19a64b582bc042e426220e080d9c21b3a82cf3f7..ed12788bcff923986fde022883e71233
  
      // Paper start
      /**
-@@ -2879,7 +2851,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2887,7 +2859,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              }
  
              this.processPortalCooldown();