diff options
author | Aikar <[email protected]> | 2020-07-18 03:57:21 -0400 |
---|---|---|
committer | Aikar <[email protected]> | 2020-07-18 03:57:21 -0400 |
commit | f6b63c6cdbcb11e74bbd199ce9b93d71fcc2600f (patch) | |
tree | 45574beac8dd42c011be96f27609b3402eeba187 /Spigot-Server-Patches/0161-Fix-this-stupid-bullshit.patch | |
parent | 108efeeeff5b8b55998113a0df1553e3bf56064d (diff) | |
download | Paper-f6b63c6cdbcb11e74bbd199ce9b93d71fcc2600f.tar.gz Paper-f6b63c6cdbcb11e74bbd199ce9b93d71fcc2600f.zip |
[Auto] Updated Upstream (CraftBukkit/Spigot)
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
CraftBukkit Changes:
2361cb8a8 Increase outdated build delay to 3 weeks
Spigot Changes:
d4cbb644 Update bungeecord-chat
Diffstat (limited to 'Spigot-Server-Patches/0161-Fix-this-stupid-bullshit.patch')
-rw-r--r-- | Spigot-Server-Patches/0161-Fix-this-stupid-bullshit.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Spigot-Server-Patches/0161-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0161-Fix-this-stupid-bullshit.patch index b0317bb130..3f2e7f4e99 100644 --- a/Spigot-Server-Patches/0161-Fix-this-stupid-bullshit.patch +++ b/Spigot-Server-Patches/0161-Fix-this-stupid-bullshit.patch @@ -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 a6f1d016696bd4feb836d5d12358b53ec9347c0e..7f9aec88ff40c63fc204e7790fb5e5a719a18cf2 100644 +index 2c0df8892461be6a139a36964f52c85fb8e28bcb..d94d25481000c3cf98affdc2fbdf9fcedbc93d94 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -218,10 +218,12 @@ 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 |