Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update upstream, unfreeze mappedregistry

Browse Source
This commit is contained in:
Cryptite
2022-08-16 09:00:56 -05:00
parent 08b0b99099
commit ac92226367
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -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

6
patches/server/0001-Build-Changes.patch
View File

@@ -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<TickTa
@@ -1672,7 +1672,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@@ -55,7 +55,7 @@ index 081c7160cf727646cdec4cd551dbc2aad56326f6..bcf30fc12e3e4e74fdc2bcc30fc67dcb
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 964ec590ef5302576ecb3ba2b8ea95dbc2acf103..5d86c4e1de032e8667b3ad2a10848ca9cca2527a 100644
index b777c1294370bdc68bc6265b039e2a405d89f2f5..cc3bbecd867a052151cb79e0d491e2d18294b204 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper

19
patches/server/0019-Unfreeze-MappedRegistry.patch Normal file
View File

@@ -0,0 +1,19 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Cryptite <cryptite@gmail.com>
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<T> extends WritableRegistry<T> {
@Override
public Registry<T> freeze() {
+ if (true) return this; // Slice (a TODO in Paper, thanks Owen)
+
this.frozen = true;
List<ResourceLocation> list = this.byKey.entrySet().stream().filter((entry) -> {
return !entry.getValue().isBound();