mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 09:23:42 +01:00
cdd0bb4376
--- work/CraftBukkit Submodule work/CraftBukkit 1ec1b05e..368f4e99: > Increase outdated build delay to 3 weeks > SPIGOT-5249: Do not add data to empty loot table > SPIGOT-5257: Call EntityBreedEvent for foxes and set the child's spawn reason to BREEDING --- work/Spigot Submodule work/Spigot e5b1b5db..ea7e48b3: > Add string default for view distance, and API to retrieve per world
33 lines
1.7 KiB
Diff
33 lines
1.7 KiB
Diff
From 8a0d99a45cd3f3330a5c785fa9c17a962df45143 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 6e08bf80..460c447d 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
@@ -217,10 +217,12 @@ public class Main {
|
|
Calendar deadline = Calendar.getInstance();
|
|
deadline.add(Calendar.DAY_OF_YEAR, -21);
|
|
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
|
|
- 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
|
|
}
|
|
}
|
|
|
|
--
|
|
2.22.0
|
|
|