From fa48c8b3ff2e04a6f41d59a0bc33f9305e602b35 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Sun, 8 Mar 2020 15:59:59 +0100
Subject: [PATCH] Fix getBukkitVersion()

---
 patches/server/0002-Brandings.patch | 30 +++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/patches/server/0002-Brandings.patch b/patches/server/0002-Brandings.patch
index 6de46b0c..fa596e3a 100644
--- a/patches/server/0002-Brandings.patch
+++ b/patches/server/0002-Brandings.patch
@@ -1,4 +1,4 @@
-From 3a1474389ab7e60e6bed23665fe726a82b261da4 Mon Sep 17 00:00:00 2001
+From 657c46021b893e6184415b1182fda23d7d9974d9 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Wed, 26 Feb 2020 18:37:34 +0100
 Subject: [PATCH] Brandings
@@ -10,11 +10,12 @@ Subject: [PATCH] Brandings
  .../net/minecraft/server/MinecraftServer.java |  2 +-
  .../org/bukkit/craftbukkit/CraftServer.java   |  2 +-
  .../craftbukkit/util/CraftMagicNumbers.java   |  2 +-
- 6 files changed, 25 insertions(+), 4 deletions(-)
+ .../bukkit/craftbukkit/util/Versioning.java   |  2 +-
+ 7 files changed, 26 insertions(+), 5 deletions(-)
  create mode 100644 src/main/java/de/tr7zw/yapfa/YapfaVersionFetcher.java
 
 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-index cd6e2592..24e852eb 100644
+index cd6e25923..24e852ebd 100644
 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 @@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole {
@@ -27,7 +28,7 @@ index cd6e2592..24e852eb 100644
          );
      }
 diff --git a/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java b/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java
-index 5a44bc64..4bd88e5b 100644
+index 5a44bc644..4bd88e5b3 100644
 --- a/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java
 +++ b/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java
 @@ -1,6 +1,7 @@
@@ -40,7 +41,7 @@ index 5a44bc64..4bd88e5b 100644
  import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap;
 diff --git a/src/main/java/de/tr7zw/yapfa/YapfaVersionFetcher.java b/src/main/java/de/tr7zw/yapfa/YapfaVersionFetcher.java
 new file mode 100644
-index 00000000..4ca5fd33
+index 000000000..4ca5fd338
 --- /dev/null
 +++ b/src/main/java/de/tr7zw/yapfa/YapfaVersionFetcher.java
 @@ -0,0 +1,20 @@
@@ -65,7 +66,7 @@ index 00000000..4ca5fd33
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c9deaffc..b5bed470 100644
+index c9deaffc4..b5bed4705 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1484,7 +1484,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -78,7 +79,7 @@ index c9deaffc..b5bed470 100644
  
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b7dfda26..d6b06c06 100644
+index b7dfda265..d6b06c06e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -203,7 +203,7 @@ import javax.annotation.Nullable; // Paper
@@ -91,7 +92,7 @@ index b7dfda26..d6b06c06 100644
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 770375ed..d88cc338 100644
+index 770375ed4..d88cc3383 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -306,7 +306,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -103,6 +104,19 @@ index 770375ed..d88cc338 100644
      }
  
      @Override
+diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
+index 674096cab..e3c4ad3d3 100644
+--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
++++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
+@@ -11,7 +11,7 @@ public final class Versioning {
+     public static String getBukkitVersion() {
+         String result = "Unknown-Version";
+ 
+-        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/com.destroystokyo.paper/paper-api/pom.properties");
++        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/de.tr7zw.yapfa/yapfa-api/pom.properties"); // YAPFA
+         Properties properties = new Properties();
+ 
+         if (stream != null) {
 -- 
 2.25.1.windows.1