diff --git a/build.gradle.kts b/build.gradle.kts
index d44ec3b9..082d4e06 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,7 +12,7 @@ repositories {
 }
 
 dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.8.1:fat")
+    remapper("net.fabricmc:tiny-remapper:0.8.2:fat")
     decompiler("net.minecraftforge:forgeflower:1.5.498.29")
     paperclip("io.papermc:paperclip:3.0.2")
 }
diff --git a/gradle.properties b/gradle.properties
index 399a5925..68abcbc5 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=76ed1567647011e23266b9da97624200ebe7639d
+paperRef=e5da93a6083218421bd4e4c6e9bf7a2492bd70ff
diff --git a/patches/api/0001-Leaves-Server-Config.patch b/patches/api/0001-Leaves-Server-Config.patch
index 80fb0e32..cef74ea5 100644
--- a/patches/api/0001-Leaves-Server-Config.patch
+++ b/patches/api/0001-Leaves-Server-Config.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Leaves Server Config
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 7a3a2ff605e06e42ba2a0263e2c50eed5c24f8e9..2c788fd242e6f55bb0c250ff48e68a54c420a59b 100644
+index 0eda17c8642aa49c2f57c409c3bd3234948feae9..a51eb9ee00f2a0a49045d5bea73a498fc20fd0b1 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1898,6 +1898,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1901,6 +1901,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
              throw new UnsupportedOperationException("Not supported yet.");
          }
          // Paper end
diff --git a/patches/server/0004-Fix-gravity-block-duper.patch b/patches/server/0004-Fix-gravity-block-duper.patch
index 1c689c5f..99d3afa8 100644
--- a/patches/server/0004-Fix-gravity-block-duper.patch
+++ b/patches/server/0004-Fix-gravity-block-duper.patch
@@ -56,10 +56,10 @@ index 49cf3601df7b145d49b1fe9a71ba0bc60c5394b3..702937e741c8607958f6e0215d11dc34
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index e234373432f34f237f884f7054c0d80829228522..2892fbc37fae0291e321093a2dbf09b64e934505 100644
+index 46102c28d10b11ecbafd3dda2de66982eaed8a00..4fcabda051480cb260194ed6116cb3d43a6d0caa 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-@@ -120,11 +120,7 @@ public class FallingBlockEntity extends Entity {
+@@ -126,11 +126,7 @@ public class FallingBlockEntity extends Entity {
  
      @Override
      public void tick() {
@@ -72,7 +72,7 @@ index e234373432f34f237f884f7054c0d80829228522..2892fbc37fae0291e321093a2dbf09b6
          if (this.blockState.isAir()) {
              this.discard();
          } else {
-@@ -137,11 +133,7 @@ public class FallingBlockEntity extends Entity {
+@@ -143,11 +139,7 @@ public class FallingBlockEntity extends Entity {
  
              this.move(MoverType.SELF, this.getDeltaMovement());