Update upstream B/CB
--- work/Bukkit Submodule work/Bukkit bbfd13dd..72e3dfd4: > SPIGOT-5486: Raider CanJoinRaid --- work/CraftBukkit Submodule work/CraftBukkit 83af86db..731e819c: > SPIGOT-5486: Raider CanJoinRaid > SPIGOT-5487: Increase outdated build delay
This commit is contained in:
@@ -9,12 +9,12 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa
|
||||
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 b562e95dcd..140b82275c 100644
|
||||
index d0af5086..75d3cbc4 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
@@ -0,0 +0,0 @@ public class Main {
|
||||
Calendar deadline = Calendar.getInstance();
|
||||
deadline.add(Calendar.DAY_OF_YEAR, -3);
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user