From 469e5c1d21e2e6d0f71d432473766a9c32cedb03 Mon Sep 17 00:00:00 2001 From: Kevin Raneri Date: Thu, 8 Aug 2024 18:18:50 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@042f15f [ci skip] chore: fix incorrect commit hash in PR builds (#11198) PaperMC/Paper@4e6a2a1 Check for block type in SculkSensorBlock#canActivate --- gradle.properties | 2 +- scripts/upstream.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index bf336869e..2c58593ac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,4 +7,4 @@ org.gradle.jvmargs="-Xmx4G" group=gg.pufferfish.pufferfish version=1.21-R0.1-SNAPSHOT mcVersion=1.21 -paperRef=7e44684a1f1fcce27ae881c78da2b793537a6b05 +paperRef=4e6a2a13a3e1f6fa1067a7821d2f018339395533 diff --git a/scripts/upstream.sh b/scripts/upstream.sh index 9b2e530c0..1e097d7c2 100755 --- a/scripts/upstream.sh +++ b/scripts/upstream.sh @@ -20,7 +20,7 @@ git add gradle.properties ./gradlew applyPatches || exit_on_error "An error occurred when merging patches!" ./gradlew rebuildPatches || exit_on_error "An error occurred when rebuilding patches!" -./gradlew createReobfPaperclipJar || exit_on_error "An error occurred when building!" +./gradlew createMojmapPaperclipJar || exit_on_error "An error occurred when building!" scripts/upstreamCommit.sh $oldHash $newHash