diff options
author | Zach Brown <[email protected]> | 2019-11-24 00:06:19 -0600 |
---|---|---|
committer | Zach Brown <[email protected]> | 2019-11-24 00:06:19 -0600 |
commit | 45089d59f0ce6d908acd7d972c97846b2c4479eb (patch) | |
tree | 9ea3328b5df6a07297604371faa47df2713dae64 | |
parent | 761c24fae94a2e2e696d04a1fe0956f67a7fdf42 (diff) | |
download | Paper-45089d59f0ce6d908acd7d972c97846b2c4479eb.tar.gz Paper-45089d59f0ce6d908acd7d972c97846b2c4479eb.zip |
Update upstream CB
--- work/CraftBukkit
Submodule work/CraftBukkit 7554e08e..ccd47a50:
> SPIGOT-5395: Call BlockFadeEvent for Scaffolding
> Increase outdated build delay to 4 weeks
-rw-r--r-- | Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch | 16 | ||||
-rw-r--r-- | Spigot-Server-Patches/0168-Fix-this-stupid-bullshit.patch | 8 | ||||
m--------- | work/CraftBukkit | 10 |
3 files changed, 17 insertions, 17 deletions
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 f00e836c82..2e19130a89 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 @@ -1,4 +1,4 @@ -From 92c1237326e854ad3b8cba593fd5cb16bed1a6e0 Mon Sep 17 00:00:00 2001 +From 27e24e367383c9b9e2af4cd826c746fee45d5766 Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Tue, 1 Mar 2016 14:32:43 -0600 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang @@ -6,7 +6,7 @@ Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java -index 3f35a28ba1..cf00f35a5b 100644 +index 3f35a28ba..cf00f35a5 100644 --- a/src/main/java/net/minecraft/server/EULA.java +++ b/src/main/java/net/minecraft/server/EULA.java @@ -70,7 +70,7 @@ public class EULA { @@ -19,7 +19,7 @@ index 3f35a28ba1..cf00f35a5b 100644 throwable = throwable1; throw throwable1; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c76f262db9..11048c37f1 100644 +index c76f262db..11048c37f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1318,7 +1318,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas @@ -32,7 +32,7 @@ index c76f262db9..11048c37f1 100644 public CrashReport b(CrashReport crashreport) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index a59f61e73a..f49bd144ff 100644 +index a59f61e73..f49bd144f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -196,7 +196,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException; @@ -45,11 +45,11 @@ index a59f61e73a..f49bd144ff 100644 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 5fe81e42ab..05f9f90551 100644 +index 7374b96d7..32c9bb841 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, -21); + deadline.add(Calendar.DAY_OF_YEAR, -28); 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 ***"); @@ -76,7 +76,7 @@ index 5fe81e42ab..05f9f90551 100644 MinecraftServer.main(options); } catch (Throwable t) { diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 27297204f1..70b187190f 100644 +index 27297204f..70b187190 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -19,7 +19,7 @@ public class WatchdogThread extends Thread @@ -116,5 +116,5 @@ index 27297204f1..70b187190f 100644 log.log( Level.SEVERE, "------------------------------" ); // -- -2.22.1 +2.24.0 diff --git a/Spigot-Server-Patches/0168-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0168-Fix-this-stupid-bullshit.patch index 28cc8018d8..3e69069c9b 100644 --- a/Spigot-Server-Patches/0168-Fix-this-stupid-bullshit.patch +++ b/Spigot-Server-Patches/0168-Fix-this-stupid-bullshit.patch @@ -1,4 +1,4 @@ -From 8a0d99a45cd3f3330a5c785fa9c17a962df45143 Mon Sep 17 00:00:00 2001 +From ecb854e19a77c30ab24c008aa7b8568584c9a765 Mon Sep 17 00:00:00 2001 From: DemonWav <[email protected]> Date: Sun, 6 Aug 2017 17:17:53 -0500 Subject: [PATCH] Fix this stupid bullshit @@ -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 6e08bf80..460c447d 100644 +index 486629a6d..56ac679b2 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); + deadline.add(Calendar.DAY_OF_YEAR, -28); if (buildDate.before(deadline.getTime())) { - System.err.println("*** Error, this build is outdated ***"); + // Paper start - This is some stupid bullshit @@ -29,5 +29,5 @@ index 6e08bf80..460c447d 100644 } -- -2.22.0 +2.24.0 diff --git a/work/CraftBukkit b/work/CraftBukkit -Subproject 7554e08e45c7a44d0f16e8078a564f92f3411ec +Subproject ccd47a503a73a68cf0b45ff0f0277601ebd1b3f |