diff --git a/Paper b/Paper index 859f1296f..55b3a09dd 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 859f1296fe05f28df5379fba59c9f1d93551474b +Subproject commit 55b3a09dde116a04d51f7176c337c5d34b4610b7 diff --git a/current-paper b/current-paper index 572adb93c..9d178c07f 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.15.2--ed1a42353f66bbaa392d3aa05bd1f2d475429014 +1.15.2--1f0191679be9b59b0ef50697095c0afeac3c4381 diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index 60206fb53..d21408252 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -1,4 +1,4 @@ -From 0f5433bc7ea1fc537ab605d06e3ddad2cf44984e Mon Sep 17 00:00:00 2001 +From 894c5cefe22f6c83571efd72a619ea94ff05fd9b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 May 2019 01:02:11 -0500 Subject: [PATCH] Rebrand @@ -15,7 +15,7 @@ Subject: [PATCH] Rebrand create mode 100644 src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java diff --git a/pom.xml b/pom.xml -index 907807ee5..37ff489db 100644 +index 55679af926..e6fc4d014e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ @@ -73,7 +73,7 @@ index 907807ee5..37ff489db 100644 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java -index cd6e25923..bb227bc0f 100644 +index cd6e259239..bb227bc0fb 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 cd6e25923..bb227bc0f 100644 ); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 346664cee..ac45dbf59 100644 +index 346664cee0..ac45dbf59b 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