diff --git a/gradle.properties b/gradle.properties index 995017d1b..5dda1c17e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=com.lokamc.slice version=1.19.2-R0.1-SNAPSHOT mcVersion=1.19.2 -paperRef=3f0415b45303568fe5d362dc3fa27b3a4ca680eb +paperRef=4ba43fe02a01abbbccac73f6ff992b6c667accb0 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0001-Build-Changes.patch b/patches/server/0001-Build-Changes.patch index 9d8ae478c..5bc9813b8 100644 --- a/patches/server/0001-Build-Changes.patch +++ b/patches/server/0001-Build-Changes.patch @@ -42,10 +42,10 @@ index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..698300a50aa20b81eac15ebef7586c97 standardInput = System.`in` workingDir = rootProject.layout.projectDirectory diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 081c7160cf727646cdec4cd551dbc2aad56326f6..bcf30fc12e3e4e74fdc2bcc30fc67dcb55592e93 100644 +index dd9ab51e904be2f2f2a2981d4f0f6638a6895e8d..03e67e89c4c5c1d79cdc3d2ae5d24d603f656758 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1656,7 +1656,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop +Date: Tue, 16 Aug 2022 08:27:13 -0500 +Subject: [PATCH] Unfreeze MappedRegistry + + +diff --git a/src/main/java/net/minecraft/core/MappedRegistry.java b/src/main/java/net/minecraft/core/MappedRegistry.java +index 3ef5d440fd3ce209110543bfd36569e846a5b749..7afb07a24c21706473c28a058214e81ebff1ab0a 100644 +--- a/src/main/java/net/minecraft/core/MappedRegistry.java ++++ b/src/main/java/net/minecraft/core/MappedRegistry.java +@@ -331,6 +331,8 @@ public class MappedRegistry extends WritableRegistry { + + @Override + public Registry freeze() { ++ if (true) return this; // Slice (a TODO in Paper, thanks Owen) ++ + this.frozen = true; + List list = this.byKey.entrySet().stream().filter((entry) -> { + return !entry.getValue().isBound();