Update upstream CB/S
--- work/CraftBukkit Submodule work/CraftBukkit 1ec1b05e..368f4e99: > Increase outdated build delay to 3 weeks > SPIGOT-5249: Do not add data to empty loot table > SPIGOT-5257: Call EntityBreedEvent for foxes and set the child's spawn reason to BREEDING --- work/Spigot Submodule work/Spigot e5b1b5db..ea7e48b3: > Add string default for view distance, and API to retrieve per world
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 d2bdd7c73f..1fa81904d4 100644
|
||||
index 6e08bf80..460c447d 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, -7);
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user