mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-21 18:15:54 +01:00
7b13d936de
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: 36b11391 Fix copy pasting in UseCooldownComponent CraftBukkit Changes: a71a7e1f5 SPIGOT-7957: Fix setTarget method for Breeze 5bc0a094b SPIGOT-7955: Failure teleporting players between worlds using Player#teleport() when player has attribute modifiers 2e09c7a36 SPIGOT-7953: Item cooldown must be greater than 0 8ef9079fa 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 9abd1dea58ffc612114d5fd8e8944d4aa8c68236..4840893082cbcd9b00f79149df1a7805af279dcb 100644
|
|
--- a/src/main/java/net/minecraft/server/Bootstrap.java
|
|
+++ b/src/main/java/net/minecraft/server/Bootstrap.java
|
|
@@ -44,7 +44,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;
|
|
@@ -58,7 +58,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 b2044a90a4f3b3e16227915269527c4ea47e0747..3dd6beb874df92056c127e2436576adb125d4ed1 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
@@ -249,10 +249,12 @@ public class Main {
|
|
Calendar deadline = Calendar.getInstance();
|
|
deadline.add(Calendar.DAY_OF_YEAR, -14);
|
|
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
|
|
}
|
|
}
|
|
|