diff --git a/gradle.properties b/gradle.properties
index 0008fec..6a20c5a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=me.totalfreedom.scissors
 version=1.18.2-R0.1-SNAPSHOT
 
 mcVersion=1.18.2
-paperRef=3f7fbe316d85040cde5e0694861a5b1675170efb
+paperRef=af3b3778f6de06af48de08d41a43565d3ff19976
 
 org.gradle.caching=true
 org.gradle.parallel=true
diff --git a/patches/server/0011-Validate-BlockState-and-SoundEvent-values.patch b/patches/server/0011-Validate-BlockState-and-SoundEvent-values.patch
index 0bfdd7e..fad964c 100644
--- a/patches/server/0011-Validate-BlockState-and-SoundEvent-values.patch
+++ b/patches/server/0011-Validate-BlockState-and-SoundEvent-values.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Validate BlockState and SoundEvent values
 
 
 diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java
-index 9865f9352ecac8175070187c2f67fedddb588864..fe87de42bc099ce41038f7f49ded9a12898e32eb 100644
+index 050ee055b9a2a0767f58d6677ad7f2d927fbaa54..9ec5bc2c29fc98ac2fbf9ff6231e8c3215ff11a1 100644
 --- a/src/main/java/net/minecraft/nbt/NbtUtils.java
 +++ b/src/main/java/net/minecraft/nbt/NbtUtils.java
-@@ -230,7 +230,7 @@ public final class NbtUtils {
+@@ -229,7 +229,7 @@ public final class NbtUtils {
          if (!compound.contains("Name", 8)) {
              return Blocks.AIR.defaultBlockState();
          } else {
diff --git a/patches/server/0017-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch b/patches/server/0017-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch
index bc41f2c..d821963 100644
--- a/patches/server/0017-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch
+++ b/patches/server/0017-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Validate String UUIDs during the CompoundTag -> GameProfile
 
 
 diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java
-index fe87de42bc099ce41038f7f49ded9a12898e32eb..07fc1fefcea853ac0aa355312d8c718dc3a4ddd7 100644
+index 9ec5bc2c29fc98ac2fbf9ff6231e8c3215ff11a1..9ef6b0a861a2b0f6e6d54775c6b0496689d12d66 100644
 --- a/src/main/java/net/minecraft/nbt/NbtUtils.java
 +++ b/src/main/java/net/minecraft/nbt/NbtUtils.java
-@@ -77,7 +77,12 @@ public final class NbtUtils {
+@@ -76,7 +76,12 @@ public final class NbtUtils {
          }
          // Paper start - support string UUID's
          if (compound.contains("Id", 8)) {