From b74fe8ea113f37f056f160717986c22c480c1e58 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 1 Jan 2020 17:44:53 -0600 Subject: [PATCH] Update upstream B/CB --- work/Bukkit Submodule work/Bukkit bbfd13dd..72e3dfd4: > SPIGOT-5486: Raider CanJoinRaid --- work/CraftBukkit Submodule work/CraftBukkit 83af86db..731e819c: > SPIGOT-5486: Raider CanJoinRaid > SPIGOT-5487: Increase outdated build delay --- ...-client-crashes-server-lists-and-Mojang.patch | 16 ++++++++-------- .../0165-Fix-this-stupid-bullshit.patch | 6 +++--- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index 2fbec7e40..f34d8a8bc 100644 --- a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -1,4 +1,4 @@ -From 6ecba3a07be62df84867738e6802b5fbab43bbef Mon Sep 17 00:00:00 2001 +From c6a8ec94558adb3989105fa9bed3b84877e18810 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 14:32:43 -0600 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang @@ -6,7 +6,7 @@ Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java -index 3f35a28ba..cf00f35a5 100644 +index 3f35a28b..cf00f35a 100644 --- a/src/main/java/net/minecraft/server/EULA.java +++ b/src/main/java/net/minecraft/server/EULA.java @@ -70,7 +70,7 @@ public class EULA { @@ -19,7 +19,7 @@ index 3f35a28ba..cf00f35a5 100644 throwable = throwable1; throw throwable1; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 490de37b6..b9b4e04ad 100644 +index 49c0764f..9117fcfd 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1330,7 +1330,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sun, 6 Aug 2017 17:17:53 -0500 Subject: [PATCH] Fix this stupid bullshit @@ -9,12 +9,12 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa and to provide some level of hint without being disruptive. diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index b562e95dcd..140b82275c 100644 +index d0af5086..75d3cbc4 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -217,10 +217,12 @@ public class Main { Calendar deadline = Calendar.getInstance(); - deadline.add(Calendar.DAY_OF_YEAR, -3); + deadline.add(Calendar.DAY_OF_YEAR, -14); if (buildDate.before(deadline.getTime())) { - System.err.println("*** Error, this build is outdated ***"); + // Paper start - This is some stupid bullshit diff --git a/work/Bukkit b/work/Bukkit index bbfd13dd1..72e3dfd4b 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit bbfd13dd14aeb217cd2730619d06fdb6dcdf23d1 +Subproject commit 72e3dfd4b250623ce5b7ff2fabfa14f1afe966f6 diff --git a/work/CraftBukkit b/work/CraftBukkit index 83af86dba..731e819c9 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 83af86dba51125169c919847413a05cf5f9d656b +Subproject commit 731e819c94c388776bf836307da4469b5fe3d032