diff --git a/gradle.properties b/gradle.properties
index f79ec88..3b19ad2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=me.totalfreedom.scissors
 version=1.20.4-R0.1-SNAPSHOT
 
 mcVersion=1.20.4
-paperRef=b03f255532bba5a1398f03207756f42e5597ccb8
+paperRef=1ed50dade82437bf45fe74833d7e6ac2961842a2
 
 org.gradle.caching=true
 org.gradle.parallel=true
diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
index 9cf32e8..53fa7c3 100644
--- a/patches/server/0001-Build-changes.patch
+++ b/patches/server/0001-Build-changes.patch
@@ -95,10 +95,10 @@ index c5d5648f4ca603ef2b1df723b58f9caf4dd3c722..21ded7c14c56a40feaa7741131be5166
                  .completer(new ConsoleCommandCompleter(this.server))
                  .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fa2b4cdd4c4e2c1df3e378a7c706f06c3361ad53..ac0000d7dbe732c96b853a6ed9e3636e23e6f2d0 100644
+index 90ae7e8c81f6a9ede8aeaeec3bf784023522cefc..e45581fca389f9f9ffb417d1cb2675c52999c454 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1854,7 +1854,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1855,7 +1855,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
@@ -108,7 +108,7 @@ index fa2b4cdd4c4e2c1df3e378a7c706f06c3361ad53..ac0000d7dbe732c96b853a6ed9e3636e
  
      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 25f41119bcc19bab7cd2fdb044147b3f78a8ef1c..f4d2b7c1d12bff88aec747ded3a6626dbba3baae 100644
+index b83c2f1e0ea117eecda94cb51b0ea5bba4d7ab5e..feabece25250b95df8274f2e96e12243a5755ec6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -264,7 +264,7 @@ import javax.annotation.Nullable; // Paper
diff --git a/patches/server/0005-Removes-useless-spammy-error-logging.patch b/patches/server/0005-Removes-useless-spammy-error-logging.patch
index 73a3ef8..c992d1a 100644
--- a/patches/server/0005-Removes-useless-spammy-error-logging.patch
+++ b/patches/server/0005-Removes-useless-spammy-error-logging.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Removes useless spammy error logging
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index ef2b0e8aa9cce09097000029e39ff70f177ed3a7..591e37648241870546b14a9732b2c94eef5f0354 100644
+index 536e80886c2393edaf526f460f49dae8c3b40295..247069ed3bead0e96a5d89a3e703e4760147f43b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -1806,8 +1806,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1813,8 +1813,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
                  resource = CraftNamespacedKey.fromMinecraft(key);
              }
          } catch (IllegalArgumentException ex) {
diff --git a/patches/server/0011-Better-handling-of-invalid-JSON-components.patch b/patches/server/0011-Better-handling-of-invalid-JSON-components.patch
index 61ae70f..01c52e2 100644
--- a/patches/server/0011-Better-handling-of-invalid-JSON-components.patch
+++ b/patches/server/0011-Better-handling-of-invalid-JSON-components.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Better handling of invalid JSON components
 
 
 diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
-index 200ed770b57e1a9240abf0473968d4b85cbefe3c..1a2a3b506e2f9bce77294c3788451bfd47394548 100644
+index 1ccf71be865af4d3c5ab8f4323a228a947e0bf3f..efebc156e45fca4b5a5896bd25398c28ef39dfe3 100644
 --- a/src/main/java/io/papermc/paper/util/MCUtil.java
 +++ b/src/main/java/io/papermc/paper/util/MCUtil.java
-@@ -654,12 +654,6 @@ public final class MCUtil {
+@@ -653,12 +653,6 @@ public final class MCUtil {
              return null;
          }
          String string = compound.getString(key);
@@ -93,7 +93,7 @@ index 186547674894fd084bceb478bb6017b747df4173..74c880425964da042ca57c097eb93273
                      }
                  }).reduce((accumulator, current) -> {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a9649cbd58e22411bfac00580a2c266cd9133802..ec0e041ee2ce4d763859a53221fb75a8da6dc283 100644
+index 2c06f3ebf7e1069727387bfc60db30c958c14b5a..fc6cff4121db4c08452817df846286103fe23ad9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2525,11 +2525,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S