diff --git a/patches/server/Support-old-UUID-format-for-NBT.patch b/patches/server/Support-old-UUID-format-for-NBT.patch
index 264d3aaff7..2ce312717e 100644
--- a/patches/server/Support-old-UUID-format-for-NBT.patch
+++ b/patches/server/Support-old-UUID-format-for-NBT.patch
@@ -78,3 +78,23 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          if (compound.hasUUID("Id")) {
              uUID = compound.getUUID("Id");
          }
+@@ -0,0 +0,0 @@ public final class NbtUtils {
+     }
+ 
+     public static CompoundTag update(DataFixer fixer, DataFixTypes fixTypes, CompoundTag compound, int oldVersion, int targetVersion) {
+-        return fixer.update(fixTypes.getType(), new Dynamic<>(NbtOps.INSTANCE, compound), oldVersion, targetVersion).getValue();
++        return (CompoundTag) fixer.update(fixTypes.getType(), new com.mojang.serialization.Dynamic<>(NbtOps.INSTANCE, compound), oldVersion, targetVersion).getValue(); // Paper - decompile fix
+     }
+ 
+     public static Component toPrettyComponent(Tag element) {
+@@ -0,0 +0,0 @@ public final class NbtUtils {
+             CompoundTag compoundTag2 = new CompoundTag();
+             if (i + 2 <= string.length()) {
+                 String string3 = string.substring(i + 1, string.indexOf(125, i));
+-                COMMA_SPLITTER.split(string3).forEach((string2) -> {
+-                    List<String> list = COLON_SPLITTER.splitToList(string2);
++                COMMA_SPLITTER.split(string3).forEach(it -> { // Paper - decompile fix
++                    List<String> list = COLON_SPLITTER.splitToList(it); // Paper - decompile fix
+                     if (list.size() == 2) {
+                         compoundTag2.putString(list.get(0), list.get(1));
+                     } else {