From 9f0cddbcef94cce7fdf87f4e909235d48e04c636 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Tue, 14 Jun 2022 20:02:26 -0500 Subject: [PATCH] Update Paper and fix updater --- gradle.properties | 2 +- patches/server/0015-Change-version-fetcher-to-AMG.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7e67753..7b723ca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.totalfreedom.scissors version=1.19-R0.1-SNAPSHOT mcVersion=1.19 -paperRef=3d37b42a89db7af2dd367861fa66c28b9e4aae97 +paperRef=48f7a1a9ef14511efb341c145c664a5a47f1f595 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0015-Change-version-fetcher-to-AMG.patch b/patches/server/0015-Change-version-fetcher-to-AMG.patch index 22ef046..7f8aeae 100644 --- a/patches/server/0015-Change-version-fetcher-to-AMG.patch +++ b/patches/server/0015-Change-version-fetcher-to-AMG.patch @@ -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 -index bf42969859545a8a520923ef1836ffa4a5cc24a0..322cd9bce402d5d34c7cb8813d05194826930c97 100644 +index bf42969859545a8a520923ef1836ffa4a5cc24a0..0aabce6dc5360b316931956b693d3792ead3cb8e 100644 --- a/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; @@ -50,12 +50,12 @@ index bf42969859545a8a520923ef1836ffa4a5cc24a0..322cd9bce402d5d34c7cb8813d051948 + // Scissors start - Allow getting git information + public static String getCommit() { + 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() { + 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 +