OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-30 16:19:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix this stupid bullshit

Browse source 
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.
This commit is contained in:
Kyle Wood 2017-08-06 17:17:53 -05:00
parent 2f6c221649
commit 0dcb203960
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
paper-server/patches/sources/net/minecraft/server/Bootstrap.java.patch
View file

@ -25,7 +25,7 @@
public static void bootStrap() { public static void bootStrap() {
if (!Bootstrap.isBootstrapped) { if (!Bootstrap.isBootstrapped) {
+ // CraftBukkit start + // CraftBukkit start
+ String name = Bootstrap.class.getSimpleName(); + /*String name = Bootstrap.class.getSimpleName(); // Paper
+ switch (name) { + switch (name) {
+ case "DispenserRegistry": + case "DispenserRegistry":
+ break; + break;
@ -39,7 +39,7 @@
+ System.err.println("*** WARNING: This server jar is unsupported, use at your own risk. ***"); + System.err.println("*** WARNING: This server jar is unsupported, use at your own risk. ***");
+ System.err.println("**********************************************************************"); + System.err.println("**********************************************************************");
+ break; + break;
+ } + }*/ // Paper
+ // CraftBukkit end + // CraftBukkit end
Bootstrap.isBootstrapped = true; Bootstrap.isBootstrapped = true;
Instant instant = Instant.now(); Instant instant = Instant.now();

8
paper-server/src/main/java/org/bukkit/craftbukkit/Main.java
View file

@ -249,10 +249,12 @@ public class Main {
Calendar deadline = Calendar.getInstance(); Calendar deadline = Calendar.getInstance();
deadline.add(Calendar.DAY_OF_YEAR, -2); deadline.add(Calendar.DAY_OF_YEAR, -2);
if (buildDate.before(deadline.getTime())) { 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("*** Please download a new build as per instructions from https://papermc.io/downloads/paper ***"); // Paper
System.err.println("*** Server will start in 20 seconds ***"); //System.err.println("*** Server will start in 20 seconds ***");
Thread.sleep(TimeUnit.SECONDS.toMillis(20)); //Thread.sleep(TimeUnit.SECONDS.toMillis(20));
// Paper end
} }
} }