mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-05 10:20:53 +01:00
a0931f4864
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: 7ca2b46c SPIGOT-7594: Fix typo and include missing MinecraftExperimental annotation in Loot Table enum CraftBukkit Changes: 176c0ad39 Fix copying BlockStates with fields (eg, Banner) ee685bd2a Fix Camel not standing up when hurt 619936d4b Increase outdated build delay
53 lines
2.9 KiB
Diff
53 lines
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 8ff786c366332588a2df053438f23cc9fb7e2b84..c887d34171f89c731d76c4ca92c70be2b1edc1e6 100644
|
|
--- a/src/main/java/net/minecraft/server/Bootstrap.java
|
|
+++ b/src/main/java/net/minecraft/server/Bootstrap.java
|
|
@@ -45,7 +45,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;
|
|
@@ -59,7 +59,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;
|
|
Instant instant = Instant.now();
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
index 1bd54fbadc9b1b5207325c78298cc72f61455ac7..a7a376e91fca80dd96f5a3e8910eba9772c67bfe 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
@@ -258,10 +258,12 @@ public class Main {
|
|
Calendar deadline = Calendar.getInstance();
|
|
deadline.add(Calendar.DAY_OF_YEAR, -28);
|
|
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
|
|
}
|
|
}
|
|
|