SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix datapacks not being able to modify nether/end (#7588)

Browse Source
This commit is contained in:
Jake Potrebic
2022-03-16 17:54:52 -07:00
parent 639b4ba80c
commit f258c4f2e9
2 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/server/MC-Dev-fixes.patch
View File

@@ -182,6 +182,30 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@Override
public void write(FriendlyByteBuf buf) {
buf.writeInt(this.playerId);
diff --git a/src/main/java/net/minecraft/resources/RegistryLoader.java b/src/main/java/net/minecraft/resources/RegistryLoader.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/resources/RegistryLoader.java
+++ b/src/main/java/net/minecraft/resources/RegistryLoader.java
@@ -0,0 +0,0 @@ public class RegistryLoader {
}
private <E> RegistryLoader.ReadCache<E> readCache(ResourceKey<? extends Registry<E>> registryRef) {
- return this.readCache.computeIfAbsent(registryRef, (ref) -> {
+ return (RegistryLoader.ReadCache<E>) this.readCache.computeIfAbsent(registryRef, (ref) -> { // Paper - decompile fix
return new RegistryLoader.ReadCache();
});
}
@@ -0,0 +0,0 @@ public class RegistryLoader {
}
public static record Bound(RegistryAccess.Writable access, RegistryLoader loader) {
- public Bound(RegistryAccess.Writable writable, RegistryLoader registryLoader) {
- this.access = writable;
- this.loader = registryLoader;
- }
public <E> DataResult<? extends Registry<E>> overrideRegistryFromResources(ResourceKey<? extends Registry<E>> registryRef, Codec<E> codec, DynamicOps<JsonElement> ops) {
WritableRegistry<E> writableRegistry = this.access.ownedWritableRegistryOrThrow(registryRef);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java