diff --git a/gradle.properties b/gradle.properties
index 642da0fb..35b2e240 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,4 +4,4 @@ version = 1.18.2-R0.1-SNAPSHOT
 mcVersion = 1.18.2
 packageVersion = 1_18_R2
 org.gradle.jvmargs=-Xmx2G
-paperRef=f210f67c4ad1560685e4354dfa242c120e42efe3
+paperRef=071a4a2444477433765cf31783eb222f8c9ec939
diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
index b77eb0b9..0290717b 100644
--- a/patches/server/0001-Build-changes.patch
+++ b/patches/server/0001-Build-changes.patch
@@ -71,10 +71,10 @@ index 218f5bafeed8551b55b91c7fccaf6935c8b631ca..6105f3bdc6e698b07181b10aec588225
                  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 c8d56947305c981a3268ce4ae3e975db350ceff2..0706891d8b042675eb67b367324925c52b6d8ddc 100644
+index da15a224b8b974e78b9d8d5f514229b3b2a5a63e..743cb6da2e21c5f7663f6f87ec4fe94c97d4e6fd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1693,7 +1693,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1696,7 +1696,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
@@ -84,7 +84,7 @@ index c8d56947305c981a3268ce4ae3e975db350ceff2..0706891d8b042675eb67b367324925c5
  
      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 ab843069ac0653d03cf3f925f49555016cad84fa..4ddbfab9c3992e044215cd2b5936893189ab13cc 100644
+index 8a248e34fce1e04de4460f98b7627df495c66af1..9387f8a9996d86abfc5fea354108c446fa859228 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -249,7 +249,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 d8b4bdfb..fc95cfa8 100644
--- a/patches/server/0003-Leaves-Server-Config.patch
+++ b/patches/server/0003-Leaves-Server-Config.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Leaves Server Config
 
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 5ba64e1083b7cb1eec64d1925095c6ca5865ff07..51bdcc4c597b7704bb2449fa80e7fea48416a5a6 100644
+index f3bf9df8c0bd56cad461210ce8551ade3a220b6b..d9c6247583990390cfdbe435cb9ad4a08f389d6f 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -238,7 +238,8 @@ public class TimingsExport extends Thread {
+@@ -240,7 +240,8 @@ public class TimingsExport extends Thread {
          parent.put("config", createObject(
              pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
              pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
@@ -19,10 +19,10 @@ index 5ba64e1083b7cb1eec64d1925095c6ca5865ff07..51bdcc4c597b7704bb2449fa80e7fea4
  
          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 0706891d8b042675eb67b367324925c52b6d8ddc..07f3ac18b83357bfc75aa6b6d3ee0bfeb6bb83e4 100644
+index 743cb6da2e21c5f7663f6f87ec4fe94c97d4e6fd..28d1199dc731a5baf8bb05cb517111c6adda559c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1177,7 +1177,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1178,7 +1178,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  String doneTime = String.format(java.util.Locale.ROOT, "%.3fs", (double) (Util.getNanos() - serverStartTime) / 1.0E9D);
                  LOGGER.info("Done ({})! For help, type \"help\"", doneTime);
                  // Paper end
@@ -67,7 +67,7 @@ index fee8996f35b38fd79946cdfd677763e0201eb57d..a06c329c15769af2cd6bf0ad1e1d73f8
          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 4ddbfab9c3992e044215cd2b5936893189ab13cc..a559790001fccaa15cbe0ac249e93ca74edbd1b0 100644
+index 9387f8a9996d86abfc5fea354108c446fa859228..57edab91d0f807208ebbe1dd7f07fcc50b86814b 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 {
@@ -86,7 +86,7 @@ index 4ddbfab9c3992e044215cd2b5936893189ab13cc..a559790001fccaa15cbe0ac249e93ca7
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -2706,6 +2708,14 @@ public final class CraftServer implements Server {
+@@ -2713,6 +2715,14 @@ public final class CraftServer implements Server {
          {
              return com.destroystokyo.paper.PaperConfig.config;
          }
diff --git a/patches/server/0004-Fix-gravity-block-duper.patch b/patches/server/0004-Fix-gravity-block-duper.patch
index aa291810..bebf598f 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 86a2eddf344503cbe75a5243a114f6fe1578185f..2324618e3db12e6c1c35cd950e03ecec98724e68 100644
+index dfd1f37757af1bd808cc2e2d8bf97123adf638bb..3992f9de087ee63b035fc11f712bb1af5aa7ddbf 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -398,36 +398,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -46,7 +46,7 @@ index 86a2eddf344503cbe75a5243a114f6fe1578185f..2324618e3db12e6c1c35cd950e03ecec
  
      // Paper start
      /**
-@@ -2781,7 +2753,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2782,7 +2754,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              }
  
              this.processPortalCooldown();