From 836db0ec9cf928db755e63cec1abcef9f4e05c95 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 15 Sep 2017 15:37:05 +0100 Subject: [PATCH] Update CB, refactor 0229-Fix-this-stupid-bullshit Refactored 0229-Fix-this-stupid-bullshit in order to prevent merge conflicts when spigot decides to update the timer and to provide some form of hint in the console/log on startup. --- ...oleAppender-for-console-improvements.patch | 8 ++-- .../0229-Fix-this-stupid-bullshit.patch | 38 ++++++++++--------- work/CraftBukkit | 2 +- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/Spigot-Server-Patches/0211-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0211-Use-TerminalConsoleAppender-for-console-improvements.patch index da57206f16..ee1b55eca4 100644 --- a/Spigot-Server-Patches/0211-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/Spigot-Server-Patches/0211-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -1,4 +1,4 @@ -From 3bd758c95ec441e1261ce7ca497b40fc5f515094 Mon Sep 17 00:00:00 2001 +From ef09bda3406cb85a42a1e09d96f566998c0ebaf2 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Fri, 9 Jun 2017 19:03:43 +0200 Subject: [PATCH] Use TerminalConsoleAppender for console improvements @@ -336,7 +336,7 @@ index 5c36e7373..cb4b78e0e 100644 @Override public PluginCommand getPluginCommand(String name) { diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index ec9508e90..d3d848f8c 100644 +index d565a720f..c9e8a8737 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -14,7 +14,7 @@ import java.util.logging.Logger; @@ -375,7 +375,7 @@ index ec9508e90..d3d848f8c 100644 + System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper } - if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { + if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java deleted file mode 100644 index 26a2fb894..000000000 @@ -639,5 +639,5 @@ index 5cee8f00e..08b6bb7f9 100644 -- -2.14.1.windows.1 +2.14.1 diff --git a/Spigot-Server-Patches/0229-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0229-Fix-this-stupid-bullshit.patch index dec5b6458e..1abf0ac5d9 100644 --- a/Spigot-Server-Patches/0229-Fix-this-stupid-bullshit.patch +++ b/Spigot-Server-Patches/0229-Fix-this-stupid-bullshit.patch @@ -1,31 +1,33 @@ -From ae60508ad1503cb1cb293934e8b3def2431716d4 Mon Sep 17 00:00:00 2001 +From e5c42e6ed2f35ac31c40b422cd7a6a6b0ee8c999 Mon Sep 17 00:00:00 2001 From: DemonWav Date: Sun, 6 Aug 2017 17:17:53 -0500 Subject: [PATCH] Fix this stupid bullshit +Disable the 15 second sleep when the server jar hasn't been rebuilt within a period of time. + +modified in order to prevent merge conflicts when Spigot changes/disables the warning, +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 d3d848f8c..9faeef1dd 100644 +index c9e8a8737..ae2c51f5d 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -203,6 +203,8 @@ public class Main { - System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper - } - -+ // Paper start - This is some stupid bullshit -+ /* - if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { - Date buildDate = new SimpleDateFormat("yyyyMMdd-HHmm").parse(Main.class.getPackage().getImplementationVendor()); - -@@ -215,6 +217,8 @@ public class Main { - Thread.sleep(TimeUnit.SECONDS.toMillis(15)); +@@ -209,10 +209,12 @@ public class Main { + Calendar deadline = Calendar.getInstance(); + 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 ++ 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)); ++ // Paper End } } -+ */ -+ // Paper end - System.out.println("Loading libraries, please wait..."); - MinecraftServer.main(options); -- -2.13.0 +2.14.1 diff --git a/work/CraftBukkit b/work/CraftBukkit index 876d22cd55..8f472147b7 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 876d22cd55a8e7ec8c851725291adb7c87ef6dc2 +Subproject commit 8f472147b7f78ccd565bc97a125030f92fdf732d