From 2df8fe9436a0aa1a1d5a77841cde90f307950ec1 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 30 May 2019 20:15:22 -0500
Subject: [PATCH] Fix  display when no version history

---
 patches/server/0001-Rebrand.patch | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch
index 6aa2bc36f..55424c148 100644
--- a/patches/server/0001-Rebrand.patch
+++ b/patches/server/0001-Rebrand.patch
@@ -1,4 +1,4 @@
-From 0b6819286bba8daa5646f990957ef56d20062ad9 Mon Sep 17 00:00:00 2001
+From c9b5349f033efc66b1241b6b3dcbef6aed95f767 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 4 May 2019 01:02:11 -0500
 Subject: [PATCH] Rebrand
@@ -7,15 +7,15 @@ Subject: [PATCH] Rebrand
  pom.xml                                       |  18 +--
  .../paper/console/PaperConsole.java           |   2 +-
  .../net/minecraft/server/MinecraftServer.java |   2 +-
- .../net/pl3x/purpur/PurpurVersionFetcher.java | 114 ++++++++++++++++++
+ .../net/pl3x/purpur/PurpurVersionFetcher.java | 115 ++++++++++++++++++
  .../org/bukkit/craftbukkit/CraftServer.java   |   2 +-
  .../craftbukkit/util/CraftMagicNumbers.java   |   2 +-
  .../bukkit/craftbukkit/util/Versioning.java   |   2 +-
- 7 files changed, 128 insertions(+), 14 deletions(-)
+ 7 files changed, 129 insertions(+), 14 deletions(-)
  create mode 100644 src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
 
 diff --git a/pom.xml b/pom.xml
-index 2cb84223e6..58096a29e5 100644
+index 2cb84223e..58096a29e 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,11 +1,11 @@
@@ -73,7 +73,7 @@ index 2cb84223e6..58096a29e5 100644
                  </configuration>
                  <executions>
 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-index cd6e259239..bb227bc0fb 100644
+index cd6e25923..bb227bc0f 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 {
@@ -86,7 +86,7 @@ index cd6e259239..bb227bc0fb 100644
          );
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 184f1b00f0..5bd0a4cc78 100644
+index 184f1b00f..5bd0a4cc7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1408,7 +1408,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -100,10 +100,10 @@ index 184f1b00f0..5bd0a4cc78 100644
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java b/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
 new file mode 100644
-index 0000000000..a05a8ff707
+index 000000000..d8b408f06
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
-@@ -0,0 +1,114 @@
+@@ -0,0 +1,115 @@
 +package net.pl3x.purpur;
 +
 +import com.destroystokyo.paper.VersionHistoryManager;
@@ -136,8 +136,9 @@ index 0000000000..a05a8ff707
 +    public String getVersionMessage(@Nonnull String serverVersion) {
 +        String[] parts = serverVersion.substring("git-Purpur-".length()).split("[-\\s]");
 +        String updateMessage = getUpdateStatusMessage("pl3xgaming/Purpur", GITHUB_BRANCH_NAME, parts[0]);
++        String history = getHistory();
 +
-+        return getHistory() + "\n" + updateMessage;
++        return history != null ? history + "\n" + updateMessage : updateMessage;
 +    }
 +
 +    private static String getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) {
@@ -219,7 +220,7 @@ index 0000000000..a05a8ff707
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 62cfb6e423..5500c3a225 100644
+index 59611846c..30bf80003 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -200,7 +200,7 @@ import javax.annotation.Nullable; // Paper
@@ -232,7 +233,7 @@ index 62cfb6e423..5500c3a225 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 551486207d..eaf871e84d 100644
+index 8d1288912..8df79c288 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -279,7 +279,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -245,7 +246,7 @@ index 551486207d..eaf871e84d 100644
      // Paper end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 674096cab1..e9aee2d8a9 100644
+index 674096cab..e9aee2d8a 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 {