Paper/Spigot-Server-Patches/0225-Fix-this-stupid-bullshit.patch

34 lines
1.7 KiB
Diff
Raw Normal View History

From 2fa3cd75bba6abd3b22121568acff664bc26c994 Mon Sep 17 00:00:00 2001
2017-08-07 00:18:20 +02:00
From: DemonWav <demonwav@gmail.com>
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.
2017-08-07 00:18:20 +02:00
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index d3d848f8..21628e19 100644
2017-08-07 00:18:20 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -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
2017-08-07 00:18:20 +02:00
}
}
--
2.14.3
2017-08-07 00:18:20 +02:00