From bdd858f13c3a3c051e7a207c5807bf4c60e130b8 Mon Sep 17 00:00:00 2001 From: MrFishCakes Date: Thu, 14 Sep 2023 10:02:19 +0100 Subject: [PATCH] Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@d527ade Updated Upstream (Paper) PurpurMC/Purpur@bd327ae Updated Upstream (Paper) PurpurMC/Purpur@7927f53 fix fire and lava immunity options, closes #1431 --- gradle.properties | 3 ++- scripts/upstreamCommit.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8d121b4..a9d4dd8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,8 @@ group = org.graphitemc.graphite version = 1.20.1-R0.1-SNAPSHOT -purpurCommit = 39bdf3d2e045857f328bd628f785c54be951e9bd +purpurCommit = 7927f53553abfa8c4d4bc4d5eb29dda44144f3dc +previousCommit = 39bdf3d2e045857f328bd628f785c54be951e9bd org.gradle.caching = true org.gradle.parallel = true diff --git a/scripts/upstreamCommit.sh b/scripts/upstreamCommit.sh index 05ff0d6..13029df 100755 --- a/scripts/upstreamCommit.sh +++ b/scripts/upstreamCommit.sh @@ -9,7 +9,8 @@ set -e PS1="$" -purpur=$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/PurpurMC/Purpur/compare/$1...HEAD | jq -r '.commits[] | "PurpurMC/Purpur@\(.sha[:7]) \(.commit.message | split("\r\n")[0] | split("\n")[0])"') +oldCommit=$(cat gradle.properties | grep previousCommit | sed 's/previousCommit = //') +purpur=$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/PurpurMC/Purpur/compare/$oldCommit...HEAD | jq -r '.commits[] | "PurpurMC/Purpur@\(.sha[:7]) \(.commit.message | split("\r\n")[0] | split("\n")[0])"') updated="" logsuffix=""