From 7fc4d26c3f5f5d04c84d5a7f1df82682f800e40f Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 16 Aug 2017 16:47:06 +0100 Subject: [PATCH] Update CB --- .../Add-MetadataStoreBase.removeAll-Plugin.patch | 6 +++--- Spigot-API-Patches/Add-async-chunk-load-API.patch | 6 +++--- .../Add-source-to-PlayerExpChangeEvent.patch | 5 ++--- Spigot-API-Patches/POM-changes.patch | 6 +++--- Spigot-API-Patches/add-Trove-and-FastUtil-to-Bukkit.patch | 6 +++--- Spigot-Server-Patches/String-based-Action-Bar-API.patch | 6 +++--- Spigot-Server-Patches/Timings-v2.patch | 7 +++---- ...-TerminalConsoleAppender-for-console-improvements.patch | 6 +++--- work/CraftBukkit | 2 +- 9 files changed, 24 insertions(+), 26 deletions(-) diff --git a/Spigot-API-Patches/Add-MetadataStoreBase.removeAll-Plugin.patch b/Spigot-API-Patches/Add-MetadataStoreBase.removeAll-Plugin.patch index e299a0af46..922477bd6a 100644 --- a/Spigot-API-Patches/Add-MetadataStoreBase.removeAll-Plugin.patch +++ b/Spigot-API-Patches/Add-MetadataStoreBase.removeAll-Plugin.patch @@ -10,9 +10,10 @@ index 64c0f0a7..6da6abd8 100644 --- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java +++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java @@ -0,0 +0,0 @@ public abstract class MetadataStoreBase { + } } - /** ++ /** + * Removes all metadata in the metadata store that originates from the + * given plugin. + * @@ -32,8 +33,7 @@ index 64c0f0a7..6da6abd8 100644 + } + } + -+ /** + /** * Creates a unique name for the object receiving metadata by combining * unique data from the subject with a metadataKey. - *

-- \ No newline at end of file diff --git a/Spigot-API-Patches/Add-async-chunk-load-API.patch b/Spigot-API-Patches/Add-async-chunk-load-API.patch index 3fc4ad2de8..a2e65dcfb8 100644 --- a/Spigot-API-Patches/Add-async-chunk-load-API.patch +++ b/Spigot-API-Patches/Add-async-chunk-load-API.patch @@ -9,9 +9,10 @@ index 67b0d516..21b2733f 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable { + */ public Chunk getChunkAt(Block block); - /** ++ /** + * Used by {@link World#getChunkAtAsync(Location,ChunkLoadCallback)} methods + * to request a {@link Chunk} to be loaded, with this callback receiving + * the chunk when it is finished. @@ -83,8 +84,7 @@ index 67b0d516..21b2733f 100644 + */ + public void getChunkAtAsync(Block block, ChunkLoadCallback cb); + -+ /** + /** * Checks if the specified {@link Chunk} is loaded * - * @param chunk The chunk to check -- \ No newline at end of file diff --git a/Spigot-API-Patches/Add-source-to-PlayerExpChangeEvent.patch b/Spigot-API-Patches/Add-source-to-PlayerExpChangeEvent.patch index 6b6b159745..6a464a6b10 100644 --- a/Spigot-API-Patches/Add-source-to-PlayerExpChangeEvent.patch +++ b/Spigot-API-Patches/Add-source-to-PlayerExpChangeEvent.patch @@ -37,7 +37,7 @@ index f37491d7..30882559 100644 exp = expAmount; } - /** ++ /** + * Get the source that provided the experience. + * + * @return The source of the experience @@ -48,8 +48,7 @@ index f37491d7..30882559 100644 + } + // Paper end + -+ /** + /** * Get the amount of experience the player will receive * - * @return The amount of experience -- \ No newline at end of file diff --git a/Spigot-API-Patches/POM-changes.patch b/Spigot-API-Patches/POM-changes.patch index 67d696a04e..aebb0a42c9 100644 --- a/Spigot-API-Patches/POM-changes.patch +++ b/Spigot-API-Patches/POM-changes.patch @@ -106,9 +106,10 @@ index 31b8f93e..360d2f08 100644 org.apache.maven.plugins @@ -0,0 +0,0 @@ + - +- - org.codehaus.mojo - animal-sniffer-maven-plugin - 1.15 @@ -128,10 +129,9 @@ index 31b8f93e..360d2f08 100644 - - - -- + org.apache.maven.plugins maven-shade-plugin - 3.0.0 @@ -0,0 +0,0 @@ diff --git a/Spigot-API-Patches/add-Trove-and-FastUtil-to-Bukkit.patch b/Spigot-API-Patches/add-Trove-and-FastUtil-to-Bukkit.patch index 9277c750d6..584e0768f6 100644 --- a/Spigot-API-Patches/add-Trove-and-FastUtil-to-Bukkit.patch +++ b/Spigot-API-Patches/add-Trove-and-FastUtil-to-Bukkit.patch @@ -9,9 +9,10 @@ index 360d2f08..c6bdf44e 100644 --- a/pom.xml +++ b/pom.xml @@ -0,0 +0,0 @@ + - ++ + net.sf.trove4j + trove4j + 3.0.3 @@ -24,8 +25,7 @@ index 360d2f08..c6bdf44e 100644 + 1.0 + provided + -+ + commons-lang commons-lang - 2.6 -- \ No newline at end of file diff --git a/Spigot-Server-Patches/String-based-Action-Bar-API.patch b/Spigot-Server-Patches/String-based-Action-Bar-API.patch index cb18c6e3f8..af55e8bc18 100644 --- a/Spigot-Server-Patches/String-based-Action-Bar-API.patch +++ b/Spigot-Server-Patches/String-based-Action-Bar-API.patch @@ -66,9 +66,10 @@ index 41330c2a2..f30613672 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player { + } // Paper start - @Override ++ @Override + public void sendActionBar(String message) { + if (getHandle().playerConnection == null || message == null || message.isEmpty()) return; + getHandle().playerConnection.sendPacket(new PacketPlayOutChat(new ChatComponentText(message), ChatMessageType.GAME_INFO)); @@ -80,8 +81,7 @@ index 41330c2a2..f30613672 100644 + sendActionBar(org.bukkit.ChatColor.translateAlternateColorCodes(alternateChar, message)); + } + -+ @Override + @Override public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) { PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter(); - packet.header = header; -- \ No newline at end of file diff --git a/Spigot-Server-Patches/Timings-v2.patch b/Spigot-Server-Patches/Timings-v2.patch index e36cb3a62a..e7e2d59139 100644 --- a/Spigot-Server-Patches/Timings-v2.patch +++ b/Spigot-Server-Patches/Timings-v2.patch @@ -1399,10 +1399,10 @@ index ec98b3a02..63bbcf0b1 100644 @Override public YamlConfiguration getConfig() { -@@ -0,0 +0,0 @@ public final class CraftServer implements Server { + return org.spigotmc.SpigotConfig.config; } - @Override ++ @Override + public YamlConfiguration getBukkitConfig() + { + return configuration; @@ -1420,10 +1420,9 @@ index ec98b3a02..63bbcf0b1 100644 + return com.destroystokyo.paper.PaperConfig.config; + } + -+ @Override + @Override public void restart() { org.spigotmc.RestartCommand.restart(); - } diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java deleted file mode 100644 index 311a2c3f6..000000000 diff --git a/Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch index 11abdf0464..3668f8fc9d 100644 --- a/Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch @@ -24,18 +24,18 @@ index 7f6f7fe84..d36611644 100644 --- a/pom.xml +++ b/pom.xml @@ -0,0 +0,0 @@ + 5.0.4 compile - +- - jline - jline - 2.12.1 - compile - -- + org.xerial sqlite-jdbc - 3.19.3 @@ -0,0 +0,0 @@ 3.0.3 compile diff --git a/work/CraftBukkit b/work/CraftBukkit index 963b19c599..357b573a19 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 963b19c5995b14f8980a42f13b1bd693a5b411d1 +Subproject commit 357b573a19943118a96a8a76142dabd1cb6d9643