2018-07-23 16:39:55 +08:00
|
|
|
From 24d03637c3ce3f7c0c5268c5516e90c1f3c6d4fa Mon Sep 17 00:00:00 2001
|
2017-08-07 06:18:20 +08:00
|
|
|
From: DemonWav <demonwav@gmail.com>
|
|
|
|
Date: Sun, 6 Aug 2017 17:17:53 -0500
|
|
|
|
Subject: [PATCH] Fix this stupid bullshit
|
|
|
|
|
2017-09-15 22:37:05 +08:00
|
|
|
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.
|
2017-08-07 06:18:20 +08:00
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
2018-07-23 16:39:55 +08:00
|
|
|
index 3245fded9b..d4f6e009e1 100644
|
2017-08-07 06:18:20 +08:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
2018-07-22 13:27:46 +08:00
|
|
|
@@ -217,10 +217,12 @@ public class Main {
|
2017-09-15 22:37:05 +08:00
|
|
|
Calendar deadline = Calendar.getInstance();
|
2018-07-18 08:08:13 +08:00
|
|
|
deadline.add(Calendar.DAY_OF_YEAR, -3);
|
2017-09-15 22:37:05 +08:00
|
|
|
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
|
2017-08-07 06:18:20 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
--
|
2018-07-04 15:55:24 +08:00
|
|
|
2.18.0
|
2017-08-07 06:18:20 +08:00
|
|
|
|