From f9080a7ecc237a2293bf820209f2bb1205cd66f6 Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Fri, 24 Jan 2025 06:29:51 -0500
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@30fdfb1 [ci/skip] Fix docs for DamageResistant (#11992)
PaperMC/Paper@6b7650d Only add goat horn once (#12001)
PaperMC/Paper@30046e0 Fix a rare crash with a concurrent modification of scaled health attributes (#12002)
PaperMC/Paper@88bbead Flush regionfiles on save configuration option
---
 gradle.properties         | 2 +-
 scripts/upstreamCommit.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 9e96df9..6685b1c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=org.galemc.gale
 version=1.21.4-R0.1-SNAPSHOT
 
 mcVersion=1.21.4
-paperRef=73f7736eb93a64cc0270929cb01992404696d66d
+paperRef=88bbead13b07914c01866e35df16b72110fa501e
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true
diff --git a/scripts/upstreamCommit.sh b/scripts/upstreamCommit.sh
index ba85a2f..9269a98 100644
--- a/scripts/upstreamCommit.sh
+++ b/scripts/upstreamCommit.sh
@@ -7,7 +7,7 @@
 # flag: --paper HASH - (Optional) the commit hash to use for comparing commits between paper (PaperMC/Paper/compare/HASH...HEAD)
 
 function getCommits() {
-    curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/"$1"/compare/"$2"..."$3" | jq -r '.commits[] | "'"$1"'@\(.sha[:7]) \(.commit.message | split("\r\n")[0] | split("\n")[0])"'
+    curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/"$1"/compare/"$2"..."$3" | jq -r '.commits[] | "'"$1"'@\(.sha[:7]) \(.commit.message | split("\r\n")[0] | split("\n")[0])" | sub("\\[ci( |-)skip]"; "[ci/skip]")'
 }
 
 (