9
0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-19 14:59:25 +00:00

Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@0797218 Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2023-06-11 23:12:58 +03:00
parent b4a2aaab7e
commit 5291304bc3
2 changed files with 27 additions and 1 deletions

View File

@@ -10,7 +10,7 @@ As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric)
Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
diff --git a/src/main/java/net/minecraft/world/entity/raid/Raid.java b/src/main/java/net/minecraft/world/entity/raid/Raid.java
index 879c3bb661e24b9682b654def57c2800f4f8ca92..99f0b75ac2b1a8ac5fe8c525c72235847e6aa27f 100644
index f7399737548483905f3b5c08a03876b0da54b714..008d1f12cf05c31f45f7c17970fc5bfb80369e26 100644
--- a/src/main/java/net/minecraft/world/entity/raid/Raid.java
+++ b/src/main/java/net/minecraft/world/entity/raid/Raid.java
@@ -107,6 +107,7 @@ public class Raid {

26
scripts/upstreamCommit.sh Normal file
View File

@@ -0,0 +1,26 @@
#!/usr/bin/env bash
# requires curl & jq
# upstreamCommit <old hash>
function getCommits() {
echo "$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/"$1"/compare/"$2"...HEAD | jq -r '.commits[] | "'"$1"'@\(.sha[:7]) \(.commit.message | split("\r\n")[0] | split("\n")[0])"')"
}
(
set -e
PS1="$"
# Purpur updates
purpurHash="$1"
purpur=$(getCommits "PurpurMC/Purpur" "$purpurHash")
updated="Purpur"
logsuffix="\n\nPurpur Changes:\n$purpur"
disclaimer="Upstream has released updates that appear to apply and compile correctly"
log="Updated Upstream ($updated)\n\n${disclaimer}${logsuffix}"
echo -e "$log" | git commit -F -
) || exit 1