geforkt von Mirrors/Paper
d8e07590e3
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 5dbedae1 PR-864: Fix Registry#match() failing namespaced inputs 49256865 PR-863: Fix boolean PersistentDataType 9f15450b SPIGOT-7195, SPIGOT-7197: Add DataPack API ebef5b6a Disable InterfaceIsType Checkstyle check 01d577f5 Slight tweak to boolean PersistentDataType javadoc d2b99e56 PR-857: Add boolean PersistentDataType CraftBukkit Changes: 2270366cd PR-1196: Test Registry instances more thoroughly 863dacb7a PR-1191: Do not start on pre-release Java 17 1f2dd8e12 SPIGOT-7362: Properly handle null in CraftBlock#blockFaceToNotch() dbc70bed5 SPIGOT-7195, SPIGOT-7197: Add DataPack API
53 Zeilen
2.9 KiB
Diff
53 Zeilen
2.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Kyle Wood <kyle@denwav.dev>
|
|
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/net/minecraft/server/Bootstrap.java b/src/main/java/net/minecraft/server/Bootstrap.java
|
|
index e43096e69a00f9ea96badd7c966443cfcf3e7b95..ac2b7b5161eaaca3620268ae865d6f2a80227fde 100644
|
|
--- a/src/main/java/net/minecraft/server/Bootstrap.java
|
|
+++ b/src/main/java/net/minecraft/server/Bootstrap.java
|
|
@@ -40,7 +40,7 @@ public class Bootstrap {
|
|
public static void bootStrap() {
|
|
if (!Bootstrap.isBootstrapped) {
|
|
// CraftBukkit start
|
|
- String name = Bootstrap.class.getSimpleName();
|
|
+ /*String name = Bootstrap.class.getSimpleName(); // Paper
|
|
switch (name) {
|
|
case "DispenserRegistry":
|
|
break;
|
|
@@ -54,7 +54,7 @@ public class Bootstrap {
|
|
System.err.println("*** WARNING: This server jar is unsupported, use at your own risk. ***");
|
|
System.err.println("**********************************************************************");
|
|
break;
|
|
- }
|
|
+ }*/ // Paper
|
|
// CraftBukkit end
|
|
Bootstrap.isBootstrapped = true;
|
|
if (BuiltInRegistries.REGISTRY.keySet().isEmpty()) {
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
index c5a403bc04fcb7a0fbc1dd1fe9ebf374e6a62af3..c79afabed432ca9094967ae0e48b04133dc4c51b 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
@@ -257,10 +257,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 ***"); // 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
|
|
}
|
|
}
|
|
|