AtlasMediaGroup/Scissors
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/Scissors.git synced 2024-11-26 22:55:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Paper and fix updater

Browse Source
This commit is contained in:
Telesphoreo 2022-06-14 20:02:26 -05:00
parent f1e08dcc42
commit 9f0cddbcef
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -2,7 +2,7 @@ group=me.totalfreedom.scissors
version=1.19-R0.1-SNAPSHOT version=1.19-R0.1-SNAPSHOT
mcVersion=1.19 mcVersion=1.19
paperRef=3d37b42a89db7af2dd367861fa66c28b9e4aae97 paperRef=48f7a1a9ef14511efb341c145c664a5a47f1f595
org.gradle.caching=true org.gradle.caching=true
org.gradle.parallel=true org.gradle.parallel=true

6
patches/server/0015-Change-version-fetcher-to-AMG.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Change version fetcher to AMG
diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
index bf42969859545a8a520923ef1836ffa4a5cc24a0..322cd9bce402d5d34c7cb8813d05194826930c97 100644 index bf42969859545a8a520923ef1836ffa4a5cc24a0..0aabce6dc5360b316931956b693d3792ead3cb8e 100644
--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
@@ -4,6 +4,8 @@ import com.destroystokyo.paper.util.VersionFetcher; @@ -4,6 +4,8 @@ import com.destroystokyo.paper.util.VersionFetcher;
@ -50,12 +50,12 @@ index bf42969859545a8a520923ef1836ffa4a5cc24a0..322cd9bce402d5d34c7cb8813d051948
+ // Scissors start - Allow getting git information + // Scissors start - Allow getting git information
+ public static String getCommit() { + public static String getCommit() {
+ final var manifest = JarManifests.manifest(Bukkit.getServer().getClass()); + final var manifest = JarManifests.manifest(Bukkit.getServer().getClass());
+ return manifest.getMainAttributes().getValue("Git-Commit"); + return manifest == null ? null : manifest.getMainAttributes().getValue("Git-Commit");
+ } + }
+ +
+ public static String getBranch() { + public static String getBranch() {
+ final var manifest = JarManifests.manifest(Bukkit.getServer().getClass()); + final var manifest = JarManifests.manifest(Bukkit.getServer().getClass());
+ return manifest.getMainAttributes().getValue("Git-Commit"); + return manifest == null ? null : manifest.getMainAttributes().getValue("Git-Branch");
+ } + }
+ // Scissors end + // Scissors end
+ +