aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAikar <[email protected]>2020-07-18 03:57:21 -0400
committerAikar <[email protected]>2020-07-18 03:57:21 -0400
commitf6b63c6cdbcb11e74bbd199ce9b93d71fcc2600f (patch)
tree45574beac8dd42c011be96f27609b3402eeba187
parent108efeeeff5b8b55998113a0df1553e3bf56064d (diff)
downloadPaper-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
-rw-r--r--Spigot-Server-Patches/0001-POM-Changes.patch4
-rw-r--r--Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch4
-rw-r--r--Spigot-Server-Patches/0161-Fix-this-stupid-bullshit.patch4
m---------work/CraftBukkit36
m---------work/Spigot0
5 files changed, 24 insertions, 24 deletions
diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch
index aab2490124..7a883c3fc3 100644
--- a/Spigot-Server-Patches/0001-POM-Changes.patch
+++ b/Spigot-Server-Patches/0001-POM-Changes.patch
@@ -190,7 +190,7 @@ index db08e98c60084b16ee18455ce014a6ea305f89c5..52834690de9f07c9c4838dbef5003156
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
<dependency>
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 93bc7535a68fbf8c2dd3b5e18cedbcbf140d60c4..113ea57fec3d71bd9842d27674eac6201d20c2d5 100644
+index eaec0c30f15e4ee4611ae7c9b2c146d75a1e0d51..5014cbbeef9a9980cca43680c3378b9d6cc210d3 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -186,7 +186,7 @@ public class Main {
@@ -201,7 +201,7 @@ index 93bc7535a68fbf8c2dd3b5e18cedbcbf140d60c4..113ea57fec3d71bd9842d27674eac620
+ Date buildDate = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").parse(Main.class.getPackage().getImplementationVendor()); // Paper
Calendar deadline = Calendar.getInstance();
- deadline.add(Calendar.DAY_OF_YEAR, -7);
+ deadline.add(Calendar.DAY_OF_YEAR, -21);
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
index 93046379d0cefd5d3236fc59e698809acdc18f80..674096cab190d62622f9947853b056f57d43a2a5 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
diff --git a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index 3f0dd42aa5..dd5bad0a5d 100644
--- a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -45,11 +45,11 @@ index c6c4033b16df4d31e87f4dca8d9293698e03958a..a07014ecb5789b4df4a770407f96c8c6
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 4e5611beaa22a08573e373cc87e9a265c8bca5aa..6eaffb5fa1a0181936c602f0045a9a815cde15dd 100644
+index fc76dc4585c54608531c75e48a3bacce7dc9d729..aa5f94f85b5792c9896fcdafe77e37ec49681d58 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -200,12 +200,25 @@ public class Main {
- 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 ***");
- System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/go/outdated-spigot ***");
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
diff --git a/work/CraftBukkit b/work/CraftBukkit
-Subproject 75a2fb8e0be1be0351966f9824648eeb58167b4
+Subproject 2361cb8a810daa0e53cff291154d0cc01584dba
diff --git a/work/Spigot b/work/Spigot
-Subproject 05da6faa3aadc7c630d79a9ec81179a85df7b9f
+Subproject d4cbb6443062c1b3c55057b267f25d47c739a4c