fix patches for 24w07a, closes #25

PaperMC · Apr 23, 2024 · 9e61558 · 9e61558
1 parent 7d70ae2
commit 9e61558
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/versions/24w07a/patches/net/minecraft/core/RegistrySetBuilder.java.patch b/versions/24w07a/patches/net/minecraft/core/RegistrySetBuilder.java.patch
@@ -1,15 +1,6 @@
 --- a/net/minecraft/core/RegistrySetBuilder.java
 +++ b/net/minecraft/core/RegistrySetBuilder.java
-@@ -269,7 +_,7 @@
-         }
-
-         public <T> HolderOwner<T> cast() {
--            return this;
-+            return (HolderOwner<T>) this;
-         }
-     }
-
-@@ -384,7 +_,7 @@
+@@ -425,13 +_,13 @@
 
          <T> Holder.Reference<T> getOrCreate(ResourceKey<T> key) {
              return (Holder.Reference<T>)this.holders
@@ -18,3 +9,10 @@
          }
      }
 
+     static class UniversalOwner implements HolderOwner<Object> {
+         public <T> HolderOwner<T> cast() {
+-            return this;
++            return (HolderOwner<T>) this;
+         }
+     }
+
diff --git a/versions/24w07a/patches/net/minecraft/server/level/ServerChunkCache.java.patch b/versions/24w07a/patches/net/minecraft/server/level/ServerChunkCache.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/ServerChunkCache.java
 +++ b/net/minecraft/server/level/ServerChunkCache.java
-@@ -573,7 +_,8 @@
+@@ -576,7 +_,8 @@
              super.doRunTask(task);
          }
 

diff --git a/versions/24w07a/patches/net/minecraft/util/datafix/DataFixers.java.patch b/versions/24w07a/patches/net/minecraft/util/datafix/DataFixers.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/util/datafix/DataFixers.java
 +++ b/net/minecraft/util/datafix/DataFixers.java
-@@ -1051,7 +_,7 @@
+@@ -1052,7 +_,7 @@
          Schema schema161 = builder.addSchema(3086, SAME_NAMESPACED);
          builder.addFixer(
              new EntityVariantFix(
@@ -9,7 +9,7 @@
                      map5.defaultReturnValue("minecraft:tabby");
                      map5.put(0, "minecraft:tabby");
                      map5.put(1, "minecraft:black");
-@@ -1088,7 +_,7 @@
+@@ -1089,7 +_,7 @@
          Schema schema162 = builder.addSchema(3087, SAME_NAMESPACED);
          builder.addFixer(
              new EntityVariantFix(