diff --git a/paper-server/patches/features/0015-Rewrite-dataconverter-system.patch b/paper-server/patches/features/0015-Rewrite-dataconverter-system.patch
index 3291cb3573..e8815d616a 100644
--- a/paper-server/patches/features/0015-Rewrite-dataconverter-system.patch
+++ b/paper-server/patches/features/0015-Rewrite-dataconverter-system.patch
@@ -26002,10 +26002,10 @@ index 0000000000000000000000000000000000000000..7eb1d865cf8ba91f15b0bb6460de7c26
 +}
 diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V4303.java b/ca/spottedleaf/dataconverter/minecraft/versions/V4303.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..dd5827a250807c810ac352547a868151dbae95df
+index 0000000000000000000000000000000000000000..b0a1766502493fa2d2ce746c47c883d270144293
 --- /dev/null
 +++ b/ca/spottedleaf/dataconverter/minecraft/versions/V4303.java
-@@ -0,0 +1,30 @@
+@@ -0,0 +1,33 @@
 +package ca.spottedleaf.dataconverter.minecraft.versions;
 +
 +import ca.spottedleaf.dataconverter.converters.DataConverter;
@@ -26021,6 +26021,9 @@ index 0000000000000000000000000000000000000000..dd5827a250807c810ac352547a868151
 +        final DataConverter<MapType, MapType> fallConverter = new DataConverter<>(VERSION) {
 +            @Override
 +            public MapType convert(final MapType data, final long sourceVersion, final long toVersion) {
++                if (!data.hasKey("FallDistance")) {
++                    return null;
++                }
 +                final float fallDistance = data.getFloat("FallDistance", 0.0f);
 +                data.remove("FallDistance");
 +
@@ -32545,7 +32548,7 @@ index 6536dc08c80170f5679acedd65cd2b9f6ad3fb3a..294cd15a796ad25823c8ccf98fbfae46
          return structureTemplate.save(new CompoundTag());
      }
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 2d597e50dcd957bd566c4da384fac5f36b5362f7..75aba65cbe1a943f21c7464ff9465e64f63e8e5b 100644
+index 8a18b0d926f80bab09a478b9d34ec914e5f76795..3527c39f3f95832d52aeda6205bbbb7161ecaf66 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -305,6 +305,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa