From dbde9e633288274069793fd43f88767d9a33c765 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 2 Aug 2018 18:29:34 -0500 Subject: [PATCH] Update upstream B/CB --- ...lient-crashes-server-lists-and-Mojang.patch | 18 +++++++++--------- .../0202-Fix-this-stupid-bullshit.patch | 14 +++++++------- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 4 files changed, 18 insertions(+), 18 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 62078159b..42c8e85ff 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 7cd9445ab28c3f5c5ce2ca674af31de0a2d1faa1 Mon Sep 17 00:00:00 2001 +From a8e2034fdf4e0bd704944a6294f759d48d386dd7 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 220ca7bca0..eb4b08be46 100644 +index 220ca7bca..eb4b08be4 100644 --- a/src/main/java/net/minecraft/server/EULA.java +++ b/src/main/java/net/minecraft/server/EULA.java @@ -52,13 +52,12 @@ public class EULA { @@ -25,7 +25,7 @@ index 220ca7bca0..eb4b08be46 100644 } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 1839bf7d24..5d5aa72ca2 100644 +index 83a73b86e..d8874c398 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1205,7 +1205,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati @@ -38,7 +38,7 @@ index 1839bf7d24..5d5aa72ca2 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 737ad3e1c0..0dda989453 100644 +index ebc2d690b..c2d479dd1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -153,7 +153,7 @@ import org.bukkit.event.server.TabCompleteEvent; @@ -51,20 +51,20 @@ index 737ad3e1c0..0dda989453 100644 private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 57da619d80..38e696aa94 100644 +index f1e832003..f7a4d53ed 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -200,7 +200,7 @@ public class Main { - deadline.add(Calendar.DAY_OF_YEAR, -3); + deadline.add(Calendar.DAY_OF_YEAR, -5); if (buildDate.before(deadline.getTime())) { System.err.println("*** Error, this build is outdated ***"); - System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/ ***"); + System.err.println("*** Please download a new build as per instructions from https://paperci.emc.gs/ ***"); // Paper - System.err.println("*** Server will start in 15 seconds ***"); - Thread.sleep(TimeUnit.SECONDS.toMillis(15)); + System.err.println("*** Server will start in 20 seconds ***"); + Thread.sleep(TimeUnit.SECONDS.toMillis(20)); } diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 94a3d4237d..91b8aa6a16 100644 +index 94a3d4237..91b8aa6a1 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -19,7 +19,7 @@ public class WatchdogThread extends Thread diff --git a/Spigot-Server-Patches/0202-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0202-Fix-this-stupid-bullshit.patch index 189d4d0c1..48d465f8f 100644 --- a/Spigot-Server-Patches/0202-Fix-this-stupid-bullshit.patch +++ b/Spigot-Server-Patches/0202-Fix-this-stupid-bullshit.patch @@ -1,4 +1,4 @@ -From 24d03637c3ce3f7c0c5268c5516e90c1f3c6d4fa Mon Sep 17 00:00:00 2001 +From 1d88edec1929e59dc4560ba2d8116ffe4ccd243e Mon Sep 17 00:00:00 2001 From: DemonWav Date: Sun, 6 Aug 2017 17:17:53 -0500 Subject: [PATCH] Fix this stupid bullshit @@ -9,21 +9,21 @@ 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 3245fded9b..d4f6e009e1 100644 +index 69a7c5205..654f976a0 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, -5); if (buildDate.before(deadline.getTime())) { - System.err.println("*** Error, this build is outdated ***"); + // Paper start - This is some stupid bullshit + System.err.println("*** Warning, you've not updated in a while! ***"); System.err.println("*** Please download a new build as per instructions from https://paperci.emc.gs/ ***"); // Paper -- System.err.println("*** Server will start in 15 seconds ***"); -- Thread.sleep(TimeUnit.SECONDS.toMillis(15)); -+ //System.err.println("*** Server will start in 15 seconds ***"); -+ //Thread.sleep(TimeUnit.SECONDS.toMillis(15)); +- System.err.println("*** Server will start in 20 seconds ***"); +- Thread.sleep(TimeUnit.SECONDS.toMillis(20)); ++ //System.err.println("*** Server will start in 20 seconds ***"); ++ //Thread.sleep(TimeUnit.SECONDS.toMillis(20)); + // Paper End } } diff --git a/work/Bukkit b/work/Bukkit index c9a81b7d2..4e075fb1f 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit c9a81b7d281f1583a75f4c3e443433f5f836fbb8 +Subproject commit 4e075fb1f1d195a006579b6d29023cdd9f47d29b diff --git a/work/CraftBukkit b/work/CraftBukkit index 5d489ff4e..2f17f677a 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 5d489ff4ee40b985352250acc69d56664a2ea2b4 +Subproject commit 2f17f677aae3db7e10ee61a676aa9aee01c30ecb