From 7e391d3fd16b0e1b76655c54987d437d1e8efcb2 Mon Sep 17 00:00:00 2001 From: Apehum Date: Mon, 9 May 2022 18:34:40 +0800 Subject: [PATCH] Upstream (Pufferfish) --- gradle.properties | 2 +- patches/server/0001-Feature-Secure-Seed.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7a47746..b962058 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ version = 1.18.2-R0.1-SNAPSHOT mcVersion = 1.18.2 packageVersion = 1_18_R2 -pufferfishRef = 3922e96e604c2a3cfd883e87c7d8f90fcef84f88 +pufferfishRef = 4053646a7673dce67ed10c0cdd2fe2f850717bf6 org.gradle.jvmargs=-Xmx2G diff --git a/patches/server/0001-Feature-Secure-Seed.patch b/patches/server/0001-Feature-Secure-Seed.patch index 19c4d3c..05ce7c2 100644 --- a/patches/server/0001-Feature-Secure-Seed.patch +++ b/patches/server/0001-Feature-Secure-Seed.patch @@ -62,7 +62,7 @@ index b42e32bd1a6a669f498b577ec04661c4ba651198..004b7cb998716ce0b4f1a0ccb7dc502e } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index c63ee396e990d11e2f613f3b5a478b486076ed56..2b56040d2aa4504cd7db6990a689e0c4e2148f9d 100644 +index 93c1f9e3e9d62cc993fedb93fe43cbeed7d39542..f9de66e6a37fc16c76606ad6562b16e42c6adcac 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -162,6 +162,7 @@ import org.bukkit.event.weather.LightningStrikeEvent; @@ -73,7 +73,7 @@ index c63ee396e990d11e2f613f3b5a478b486076ed56..2b56040d2aa4504cd7db6990a689e0c4 public class ServerLevel extends Level implements WorldGenLevel { -@@ -505,6 +506,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -506,6 +507,7 @@ public class ServerLevel extends Level implements WorldGenLevel { } chunkgenerator.conf = spigotConfig; // Spigot // CraftBukkit end