SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issue with manifest util in tests

Browse Source
This commit is contained in:
Jason Penilla
2021-11-27 00:30:51 -08:00
parent 7b6179345f
commit 4cf1f0d22a
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
patches/api/Add-Git-information-to-version-command-on-startup.patch
View File

@@ -73,7 +73,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ */ + */
+ @NotNull + @NotNull
+ public static String getVersionMessage() { + public static String getVersionMessage() {
+ final var manifest = JarManifests.manifest(Bukkit.getServer().getClass()); + final java.util.jar.Manifest manifest;
+ if (java.lang.reflect.Proxy.isProxyClass(Bukkit.getServer().getClass())) { // TestServer
+ manifest = new java.util.jar.Manifest();
+ } else {
+ manifest = JarManifests.manifest(Bukkit.getServer().getClass());
+ }
+ final String gitBranch = manifest.getMainAttributes().getValue("Git-Branch"); + final String gitBranch = manifest.getMainAttributes().getValue("Git-Branch");
+ final String gitCommit = manifest.getMainAttributes().getValue("Git-Commit"); + final String gitCommit = manifest.getMainAttributes().getValue("Git-Commit");
+ String branchMsg = " on " + gitBranch; + String branchMsg = " on " + gitBranch;