diff --git a/paper-server/patches/features/0015-Rewrite-dataconverter-system.patch b/paper-server/patches/features/0015-Rewrite-dataconverter-system.patch
index 4994ca8035..3291cb3573 100644
--- a/paper-server/patches/features/0015-Rewrite-dataconverter-system.patch
+++ b/paper-server/patches/features/0015-Rewrite-dataconverter-system.patch
@@ -217,7 +217,7 @@ index 0000000000000000000000000000000000000000..515f6691c72ffa82ac8b92646768be7a
 +}
 diff --git a/ca/spottedleaf/dataconverter/minecraft/MCVersionRegistry.java b/ca/spottedleaf/dataconverter/minecraft/MCVersionRegistry.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..9ed6c1512139c33dd695e4b3523b0382e4cde0ff
+index 0000000000000000000000000000000000000000..7b5803c8f8bf0b201f6862768cf6d6b6fa103b1e
 --- /dev/null
 +++ b/ca/spottedleaf/dataconverter/minecraft/MCVersionRegistry.java
 @@ -0,0 +1,487 @@
@@ -503,7 +503,7 @@ index 0000000000000000000000000000000000000000..9ed6c1512139c33dd695e4b3523b0382
 +            4314,
 +            4420,
 +            4424,
-+            // All up to 1.21.6
++            // All up to 1.21.7
 +        };
 +        Arrays.sort(converterVersions);
 +
@@ -710,10 +710,10 @@ index 0000000000000000000000000000000000000000..9ed6c1512139c33dd695e4b3523b0382
 +}
 diff --git a/ca/spottedleaf/dataconverter/minecraft/MCVersions.java b/ca/spottedleaf/dataconverter/minecraft/MCVersions.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..03cf3ecebdb6629f11465d842bdd6263f19863c6
+index 0000000000000000000000000000000000000000..7a46f8fbc90f65a2bf849d2bec5709145b8e6458
 --- /dev/null
 +++ b/ca/spottedleaf/dataconverter/minecraft/MCVersions.java
-@@ -0,0 +1,597 @@
+@@ -0,0 +1,600 @@
 +package ca.spottedleaf.dataconverter.minecraft;
 +
 +@SuppressWarnings("unused")
@@ -1308,6 +1308,9 @@ index 0000000000000000000000000000000000000000..03cf3ecebdb6629f11465d842bdd6263
 +    public static final int V1_21_6_PRE4          = 4433;
 +    public static final int V1_21_6_RC1           = 4434;
 +    public static final int V1_21_6               = 4435;
++    public static final int V1_21_7_RC1           = 4436;
++    public static final int V1_21_7_RC2           = 4437;
++    public static final int V1_21_7               = 4438;
 +
 +    private MCVersions() {}
 +}
@@ -24851,7 +24854,7 @@ index 0000000000000000000000000000000000000000..7d09c4218d0db8119d1681bf95900be8
 +}
 diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V4290.java b/ca/spottedleaf/dataconverter/minecraft/versions/V4290.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..d5dfa9a64e2d3f9a37a5bdde60b92ed93bd89aed
+index 0000000000000000000000000000000000000000..44e74a97debbb36deb50a1f726ee25cc5272ab09
 --- /dev/null
 +++ b/ca/spottedleaf/dataconverter/minecraft/versions/V4290.java
 @@ -0,0 +1,312 @@
@@ -25107,7 +25110,7 @@ index 0000000000000000000000000000000000000000..d5dfa9a64e2d3f9a37a5bdde60b92ed9
 +                        };
 +
 +                        convertNested(ret);
-+                        directWalkComponent(ret, sourceVersion, toVersion);
++                        directWalkComponent(ret, sourceVersion, toVersion); // Fix MC-299285
 +                        return ret;
 +                    }
 +                } catch (final JsonParseException ex) {