From 8d5f9137b47b8b98def7ce7914e8c5c048db377f Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Sat, 27 Nov 2021 00:30:51 -0800
Subject: [PATCH] Fix issue with manifest util in tests

---
 ...it-information-to-version-command-on-startup.patch | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/patches/api/0315-Add-Git-information-to-version-command-on-startup.patch b/patches/api/0315-Add-Git-information-to-version-command-on-startup.patch
index 6443962c0f..82c37a610f 100644
--- a/patches/api/0315-Add-Git-information-to-version-command-on-startup.patch
+++ b/patches/api/0315-Add-Git-information-to-version-command-on-startup.patch
@@ -47,7 +47,7 @@ index 0000000000000000000000000000000000000000..2a49f4198b07b3ecdc320c330c58eab2
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 0521781a48d326c0a4a01b920188e9ce00b51ef0..5a3dbcc9d67ba7f22c12e8854a36bb2076d2d81a 100644
+index 0521781a48d326c0a4a01b920188e9ce00b51ef0..7bbeed0c0514d5da243e205a78f82116b464acd1 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -51,6 +51,7 @@ import org.bukkit.util.CachedServerIcon;
@@ -58,7 +58,7 @@ index 0521781a48d326c0a4a01b920188e9ce00b51ef0..5a3dbcc9d67ba7f22c12e8854a36bb20
  
  /**
   * Represents the Bukkit core, for version and Server singleton handling
-@@ -100,7 +101,25 @@ public final class Bukkit {
+@@ -100,7 +101,30 @@ public final class Bukkit {
          }
  
          Bukkit.server = server;
@@ -73,7 +73,12 @@ index 0521781a48d326c0a4a01b920188e9ce00b51ef0..5a3dbcc9d67ba7f22c12e8854a36bb20
 +      */
 +    @NotNull
 +    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 gitCommit = manifest.getMainAttributes().getValue("Git-Commit");
 +        String branchMsg = " on " + gitBranch;