ea855e2b46
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Developers!: You will need to clean up your work/Minecraft/1.13.2 folder for this Also, restore a patch that was dropped in the last upstream Bukkit Changes: 279eeab3 Fix command description not being set 96e2bb18 Remove debug print from SyntheticEventTest CraftBukkit Changes:d3ed1516Fix dangerously threaded beacons217a293dDon't relocate joptsimple to allow --help to work.1be05a21Prepare for imminent Java 12 releasea49270b2Mappings Update5259d80cSPIGOT-4669: Fix PlayerTeleportEvent coordinates for relative teleports Spigot Changes: e6eb36f2 Rebuild patches
34 Zeilen
1.7 KiB
Diff
34 Zeilen
1.7 KiB
Diff
From 1e6c11f9a5dd6028668fc391de996e39c2cf01fa 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 04991c991..2d5167eb9 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.21.0
|
|
|