mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 19:15:32 +01:00
836db0ec9c
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.
34 lines
1.7 KiB
Diff
34 lines
1.7 KiB
Diff
From e5c42e6ed2f35ac31c40b422cd7a6a6b0ee8c999 Mon Sep 17 00:00:00 2001
|
|
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.
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
index c9e8a8737..ae2c51f5d 100644
|
|
--- 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
|
|
}
|
|
}
|
|
|
|
--
|
|
2.14.1
|
|
|