From 7811aecad641ee32357d6036fb2ee794ca73a9fe Mon Sep 17 00:00:00 2001 From: Mariell Date: Mon, 26 Oct 2020 16:02:55 +0100 Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit) (#4688) 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 Bukkit Changes: 4abf9e96 #557: Add TNTPrimed#setSource method CraftBukkit Changes: dea41389 Remove outdated build delay. 9da3b5bf #762: Add TNTPrimed#setSource method --- Spigot-API-Patches/Entity-Origin-API.patch | 4 ++-- Spigot-Server-Patches/POM-Changes.patch | 2 +- ...Use-TerminalConsoleAppender-for-console-improvements.patch | 2 +- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Spigot-API-Patches/Entity-Origin-API.patch b/Spigot-API-Patches/Entity-Origin-API.patch index e5210000d7..55462474d7 100644 --- a/Spigot-API-Patches/Entity-Origin-API.patch +++ b/Spigot-API-Patches/Entity-Origin-API.patch @@ -50,9 +50,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/entity/TNTPrimed.java +++ b/src/main/java/org/bukkit/entity/TNTPrimed.java @@ -0,0 +0,0 @@ public interface TNTPrimed extends Explosive { + * @param source the source of this primed TNT */ - @Nullable - public Entity getSource(); + public void setSource(@Nullable Entity source); + + /** + * Gets the source block location of the TNTPrimed diff --git a/Spigot-Server-Patches/POM-Changes.patch b/Spigot-Server-Patches/POM-Changes.patch index 2c20c46419..324142b64c 100644 --- a/Spigot-Server-Patches/POM-Changes.patch +++ b/Spigot-Server-Patches/POM-Changes.patch @@ -202,7 +202,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public class Main { } - if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { + if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { - Date buildDate = new Date(Integer.parseInt(Main.class.getPackage().getImplementationVendor()) * 1000L); + Date buildDate = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").parse(Main.class.getPackage().getImplementationVendor()); // Paper diff --git a/Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch index c1623662fe..974edb7601 100644 --- a/Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch @@ -325,7 +325,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper } - if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { + if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { @@ -0,0 +0,0 @@ public class Main { System.out.println("Unable to read system info"); } diff --git a/work/Bukkit b/work/Bukkit index 01e22e0972..4abf9e96df 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 01e22e09726e700776739ec0662acd30e7844cec +Subproject commit 4abf9e96df578e4c842c865e50d0933ce0616938 diff --git a/work/CraftBukkit b/work/CraftBukkit index 55a78ffbd7..dea4138900 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 55a78ffbd7517025ecd66ab0fe5b47cc5205222c +Subproject commit dea4138900788a64db46db74903cf7ed50681738