aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0146-Fix-this-stupid-bullshit.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0146-Fix-this-stupid-bullshit.patch')
-rw-r--r--patches/server/0146-Fix-this-stupid-bullshit.patch52
1 files changed, 52 insertions, 0 deletions
diff --git a/patches/server/0146-Fix-this-stupid-bullshit.patch b/patches/server/0146-Fix-this-stupid-bullshit.patch
new file mode 100644
index 0000000000..06f8ccc1c5
--- /dev/null
+++ b/patches/server/0146-Fix-this-stupid-bullshit.patch
@@ -0,0 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Kyle Wood <[email protected]>
+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/net/minecraft/server/Bootstrap.java b/src/main/java/net/minecraft/server/Bootstrap.java
+index 8f1992188f7fd9e735569e099b36a7eafed47aae..061c89b985dafc79c808dd5f0e296b9fbac2fdfc 100644
+--- a/src/main/java/net/minecraft/server/Bootstrap.java
++++ b/src/main/java/net/minecraft/server/Bootstrap.java
+@@ -43,7 +43,7 @@ public class Bootstrap {
+ public static void bootStrap() {
+ if (!Bootstrap.isBootstrapped) {
+ // CraftBukkit start
+- String name = Bootstrap.class.getSimpleName();
++ /*String name = Bootstrap.class.getSimpleName(); // Paper
+ switch (name) {
+ case "DispenserRegistry":
+ break;
+@@ -57,7 +57,7 @@ public class Bootstrap {
+ System.err.println("*** WARNING: This server jar is unsupported, use at your own risk. ***");
+ System.err.println("**********************************************************************");
+ break;
+- }
++ }*/ // Paper
+ // CraftBukkit end
+ Bootstrap.isBootstrapped = true;
+ Instant instant = Instant.now();
+diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
+index 75a3c7ed5500f0451c9c1efdfc3cb809445c8acf..8245b38d37b4cee6f4e7b61d7af40a18e54a3f43 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
++++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -260,10 +260,12 @@ public class Main {
+ Calendar deadline = Calendar.getInstance();
+ deadline.add(Calendar.DAY_OF_YEAR, -7);
+ 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://papermc.io/downloads/paper ***"); // Paper
+- 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
+ }
+ }
+