diff --git a/build.gradle.kts b/build.gradle.kts
index a2dc8565..d44ec3b9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,7 +13,7 @@ repositories {
 
 dependencies {
     remapper("net.fabricmc:tiny-remapper:0.8.1:fat")
-    decompiler("net.minecraftforge:forgeflower:1.5.498.22")
+    decompiler("net.minecraftforge:forgeflower:1.5.498.29")
     paperclip("io.papermc:paperclip:3.0.2")
 }
 
diff --git a/gradle.properties b/gradle.properties
index 19c22017..93c926e5 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=87e11bf7fdf48ecdf3e1cae383c368b9b61d7df9
+paperRef=f8e8d6c3cd8bfd48d9df5d8877619b81c88c1e88
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 00e33ede..aa991fce 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/patches/server/0005-Fix-trading-with-the-void.patch b/patches/server/0005-Fix-trading-with-the-void.patch
index 42b84bc0..080bde73 100644
--- a/patches/server/0005-Fix-trading-with-the-void.patch
+++ b/patches/server/0005-Fix-trading-with-the-void.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix trading with the void
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 3b1a34b34979ab436ccd33f0a85bfae537cbecb4..4abef526bac519f4f4d0ce1c42c3eec4f440eb59 100644
+index 50fd3419deb668dda64b1056f03fb66da55e6960..f3e73e351a394f29897444ca7aac2477fdec26af 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2503,11 +2503,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2509,11 +2509,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // Spigot end
              // Spigot Start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message