diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index 33050be5d..1f328f362 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -1,21 +1,21 @@ -From d8265c1939a992ff975a7d259bf3e60abec03067 Mon Sep 17 00:00:00 2001 +From 3a3464e136495567803d13620ab7fe5fe349b291 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 May 2019 01:02:11 -0500 Subject: [PATCH] Rebrand --- - pom.xml | 31 +++-- + pom.xml | 33 +++-- .../paper/console/PaperConsole.java | 2 +- .../net/minecraft/server/MinecraftServer.java | 2 +- .../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, 142 insertions(+), 14 deletions(-) + 7 files changed, 143 insertions(+), 15 deletions(-) create mode 100644 src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java diff --git a/pom.xml b/pom.xml -index ef8ee637a..97c73571b 100644 +index ef8ee637a8..8044fa0740 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,11 @@ @@ -85,8 +85,17 @@ index ef8ee637a..97c73571b 100644 clean install +@@ -172,7 +185,7 @@ + gitdescribe-maven-plugin + 1.3 + +- git-Paper- ++ git-Purpur- + .. + + diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java -index 74ed02fa9..c1280478e 100644 +index 74ed02fa92..c1280478ee 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 { @@ -99,7 +108,7 @@ index 74ed02fa9..c1280478e 100644 .completer(new ConsoleCommandCompleter(this.server)) ); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 5c862de2f..0d0998b06 100644 +index d8d11ed962..bfdff5c96d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1446,7 +1446,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant