2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2021-07-20 04:07:53 +02:00
|
|
|
From: Kyle Wood <kyle@denwav.dev>
|
2021-06-11 14:02:28 +02:00
|
|
|
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.
|
|
|
|
|
2021-06-12 19:13:23 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/Bootstrap.java b/src/main/java/net/minecraft/server/Bootstrap.java
|
2023-02-19 15:57:10 +01:00
|
|
|
index e43096e69a00f9ea96badd7c966443cfcf3e7b95..ac2b7b5161eaaca3620268ae865d6f2a80227fde 100644
|
2021-06-12 19:13:23 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/Bootstrap.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Bootstrap.java
|
2022-12-07 19:52:24 +01:00
|
|
|
@@ -40,7 +40,7 @@ public class Bootstrap {
|
2021-06-12 19:13:23 +02:00
|
|
|
public static void bootStrap() {
|
|
|
|
if (!Bootstrap.isBootstrapped) {
|
|
|
|
// CraftBukkit start
|
|
|
|
- String name = Bootstrap.class.getSimpleName();
|
2022-06-09 23:27:06 +02:00
|
|
|
+ /*String name = Bootstrap.class.getSimpleName(); // Paper
|
2021-06-12 19:13:23 +02:00
|
|
|
switch (name) {
|
|
|
|
case "DispenserRegistry":
|
|
|
|
break;
|
2022-12-07 19:52:24 +01:00
|
|
|
@@ -54,7 +54,7 @@ public class Bootstrap {
|
2021-06-12 19:13:23 +02:00
|
|
|
System.err.println("*** WARNING: This server jar is unsupported, use at your own risk. ***");
|
|
|
|
System.err.println("**********************************************************************");
|
|
|
|
break;
|
|
|
|
- }
|
|
|
|
+ }*/ // Paper
|
|
|
|
// CraftBukkit end
|
|
|
|
Bootstrap.isBootstrapped = true;
|
2022-12-07 19:52:24 +01:00
|
|
|
if (BuiltInRegistries.REGISTRY.keySet().isEmpty()) {
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
2023-03-20 09:47:10 +01:00
|
|
|
index ebf561bce1b442f2b3a138d4ba0ed252e4ba3207..a8b21195ca304b3ff68c8bf7e336b4df64603c10 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
2023-03-14 19:36:39 +01:00
|
|
|
@@ -250,10 +250,12 @@ public class Main {
|
2021-06-11 14:02:28 +02:00
|
|
|
Calendar deadline = Calendar.getInstance();
|
2023-03-20 09:47:10 +01:00
|
|
|
deadline.add(Calendar.DAY_OF_YEAR, -7);
|
2021-06-11 14:02:28 +02: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://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
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|