From e6fb86fc9bb7927a51b46807b6e8fb6dada2c294 Mon Sep 17 00:00:00 2001 From: Lexi Date: Fri, 17 Jun 2022 03:53:16 -0400 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@0c1643c Fix MC-252439 (#7994) PaperMC/Paper@0ae78d3 Fix advancement saving before reloads (#8003) PaperMC/Paper@f428887 Prevent empty items from being added to world (#7998) PaperMC/Paper@dd61319 Couple fixes for command blocks (#8004) PaperMC/Paper@d1b1c6f Add missing deprecation to AdvancementDisplayType (#7876) PaperMC/Paper@81f2eec [ci skip] rebuild patches PaperMC/Paper@e269a0a Fix incorrect random nextLong to nextInt (#8009) PaperMC/Paper@b77fe3a Temp: Disable javadoc.io for now --- gradle.properties | 2 +- patches/server/0003-Add-SoundEvent.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index c8f2c1d..9f0a87f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = gg.projecteden.parchment version = 1.19-R0.1-SNAPSHOT mcVersion = 1.19 -paperRef = 2dcfb2b11fb0ef9807d01c81e891d90b74ba4750 +paperRef = b77fe3a42b270bb6da2afdef1657968b3b4dcab4 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0003-Add-SoundEvent.patch b/patches/server/0003-Add-SoundEvent.patch index 6b7b428..ace68e2 100644 --- a/patches/server/0003-Add-SoundEvent.patch +++ b/patches/server/0003-Add-SoundEvent.patch @@ -76,10 +76,10 @@ index 3f25a9b1a74cfa0c9a4d0379ecda109d99f33db3..b954cda43afbfd367f7f8f436dca65f9 public static @Nullable BinaryTagHolder asBinaryTagHolder(final @Nullable CompoundTag tag) { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 0dc7a827aeacc7fae53b1f975f45883da7db6a0c..782be663520c27fccb58484ec56cc94def38f136 100644 +index 2b9669df574cf95c2643344a66ad18b213bd9cd7..ce354a3bd5deea844f86c89d555b438c50de31b8 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1540,12 +1540,40 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1541,12 +1541,40 @@ public class ServerLevel extends Level implements WorldGenLevel { @Override public void playSeededSound(@Nullable Player except, double x, double y, double z, SoundEvent sound, SoundSource category, float volume, float pitch, long seed) {