Update CB

2017-08-16 16:47:06 +01:00 · 2017-08-16 16:47:06 +01:00 · 4368f412c6
parent a8c70655c0
commit 4368f412c6
9 changed files with 48 additions and 50 deletions
--- a/Spigot-API-Patches/0001-POM-changes.patch
+++ b/Spigot-API-Patches/0001-POM-changes.patch
@ -1,4 +1,4 @@
-From e6590f041d0d90774eb4d5b24cbd0e83f8a1129b Mon Sep 17 00:00:00 2001
+From bb482a4433501afba6f645feccbcb9462eda8fd0 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 00:16:08 +0100
 Subject: [PATCH] POM changes
@ -105,10 +105,11 @@ index 31b8f93e..360d2f08 100644
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-@@ -119,26 +138,6 @@
+@@ -118,26 +137,6 @@
+                     </dependency>
                 </dependencies>
             </plugin>
-             <plugin>
+-            <plugin>
 -                <groupId>org.codehaus.mojo</groupId>
 -                <artifactId>animal-sniffer-maven-plugin</artifactId>
 -                <version>1.15</version>
@ -128,10 +129,9 @@ index 31b8f93e..360d2f08 100644
 -                    </signature>
 -                </configuration>
 -            </plugin>
-            <plugin>
+             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                 <version>3.0.0</version>
@@ -151,6 +150,7 @@
                     </execution>
                 </executions>
@ -141,5 +141,5 @@ index 31b8f93e..360d2f08 100644
                     <shadedArtifactAttached>true</shadedArtifactAttached>
                 </configuration>
 -- 
-2.13.4
+2.14.1

--- a/Spigot-API-Patches/0002-add-Trove-and-FastUtil-to-Bukkit.patch
+++ b/Spigot-API-Patches/0002-add-Trove-and-FastUtil-to-Bukkit.patch
@ -1,4 +1,4 @@
-From 748238d525ac30269377a8ebd87d25324867d2db Mon Sep 17 00:00:00 2001
+From ccc005acdc20c3e802fd5148cb10b18c674b61a5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 1 Apr 2016 00:02:47 -0400
 Subject: [PATCH] add Trove and FastUtil to Bukkit
@ -8,10 +8,11 @@ diff --git a/pom.xml b/pom.xml
 index 360d2f08..c6bdf44e 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -56,6 +56,19 @@
+@@ -55,6 +55,19 @@
+     </repositories>
 
     <dependencies>
-         <dependency>
+        <dependency>
 +            <groupId>net.sf.trove4j</groupId>
 +            <artifactId>trove4j</artifactId>
 +            <version>3.0.3</version>
@ -24,10 +25,9 @@ index 360d2f08..c6bdf44e 100644
 +            <version>1.0</version>
 +            <scope>provided</scope>
 +        </dependency>
-+        <dependency>
+         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
-             <version>2.6</version>
 -- 
-2.13.4
+2.14.1

--- a/Spigot-API-Patches/0006-Add-async-chunk-load-API.patch
+++ b/Spigot-API-Patches/0006-Add-async-chunk-load-API.patch
@ -1,4 +1,4 @@
-From 80f89a9b8a58be1a4dd5d288b51ba88f66e97179 Mon Sep 17 00:00:00 2001
+From fcbdb6e87df51ee39a544433fea61dc4382325df Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 17:43:33 -0600
 Subject: [PATCH] Add async chunk load API
@ -8,10 +8,11 @@ diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/Worl
 index 67b0d516..21b2733f 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -137,6 +137,78 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -136,6 +136,78 @@ 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,10 +84,9 @@ 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
 -- 
-2.13.4
+2.14.1

--- a/Spigot-API-Patches/0032-Add-MetadataStoreBase.removeAll-Plugin.patch
+++ b/Spigot-API-Patches/0032-Add-MetadataStoreBase.removeAll-Plugin.patch
@ -1,4 +1,4 @@
-From cf60d71f66765ec09cd221cd08bcab046e3c04c0 Mon Sep 17 00:00:00 2001
+From 3c8b5f4e36899b160be3c561bb94fbb9e01def01 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 16 Jul 2013 21:26:50 -0400
 Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin)
@ -9,10 +9,11 @@ diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main
 index 64c0f0a7..6da6abd8 100644
 --- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
 +++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
-@@ -125,6 +125,26 @@ public abstract class MetadataStoreBase<T> {
+@@ -124,6 +124,26 @@ public abstract class MetadataStoreBase<T> {
+         }
     }
 
-     /**
+    /**
 +     * Removes all metadata in the metadata store that originates from the
 +     * given plugin.
 +     *
@ -32,10 +33,9 @@ index 64c0f0a7..6da6abd8 100644
 +        }
 +    }
 +
-+    /**
+     /**
      * Creates a unique name for the object receiving metadata by combining
      * unique data from the subject with a metadataKey.
-      * <p>
 -- 
-2.13.4
+2.14.1

--- a/Spigot-API-Patches/0041-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-API-Patches/0041-Add-source-to-PlayerExpChangeEvent.patch
@ -1,4 +1,4 @@
-From f824a6c4c45b5005fe1929e7fbf39d9eaf025074 Mon Sep 17 00:00:00 2001
+From de084b3fedb588ce21b0ea7c3e08965804bb7971 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:47:08 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
@ -8,7 +8,7 @@ diff --git a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java b/s
 index f37491d7..30882559 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
-@@ -1,21 +1,43 @@
+@@ -1,20 +1,42 @@
 package org.bukkit.event.player;
 
 +import org.bukkit.entity.Entity; // Paper
@ -37,7 +37,7 @@ index f37491d7..30882559 100644
          exp = expAmount;
     }
 
-     /**
+    /**
 +     * Get the source that provided the experience.
 +     *
 +     * @return The source of the experience
@ -48,10 +48,9 @@ index f37491d7..30882559 100644
 +    }
 +    // Paper end
 +
-+    /**
+     /**
      * Get the amount of experience the player will receive
      *
-      * @return The amount of experience
 -- 
-2.13.4
+2.14.1

--- a/Spigot-Server-Patches/0006-Timings-v2.patch
+++ b/Spigot-Server-Patches/0006-Timings-v2.patch
@ -1,4 +1,4 @@
-From 084a67c73266f251443ffb13ae4b378706bc7a2b Mon Sep 17 00:00:00 2001
+From d50a1cc9ec4e62c38eb67ec9782c9496944420bf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@ -1391,7 +1391,7 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/ja
 index ec98b3a02..63bbcf0b1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1755,6 +1755,7 @@ public final class CraftServer implements Server {
+@@ -1755,12 +1755,31 @@ public final class CraftServer implements Server {
     private final Spigot spigot = new Spigot()
     {
 
@ -1399,10 +1399,10 @@ index ec98b3a02..63bbcf0b1 100644
         @Override
         public YamlConfiguration getConfig()
         {
-@@ -1762,6 +1763,24 @@ 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
@ -1907,5 +1906,5 @@ index 2bd690fdf..38be7ed71 100644
     }
 }
 -- 
-2.13.4
+2.14.1

--- a/Spigot-Server-Patches/0187-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0187-String-based-Action-Bar-API.patch
@ -1,4 +1,4 @@
-From 5cacb04e314cf7d0442b8a1c26413b76d030dc09 Mon Sep 17 00:00:00 2001
+From 7a7a70f17bef67e3a2ef1aee652d0328cc38e8c8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 15:02:42 -0500
 Subject: [PATCH] String based Action Bar API
@ -65,10 +65,11 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/
 index 41330c2a2..f30613672 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -172,6 +172,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -171,6 +171,18 @@ 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,10 +81,9 @@ 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;
 -- 
-2.13.4
+2.14.1

--- a/Spigot-Server-Patches/0211-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0211-Use-TerminalConsoleAppender-for-console-improvements.patch
@ -1,4 +1,4 @@
-From f38db227895c395f7cca144b1d521c6e6233d6fe Mon Sep 17 00:00:00 2001
+From d1999325ad4e522cd4e5636816b77855beca4695 Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@minecrell.net>
 Date: Fri, 9 Jun 2017 19:03:43 +0200
 Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@ -23,19 +23,19 @@ diff --git a/pom.xml b/pom.xml
 index 7f6f7fe84..d36611644 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -54,12 +54,6 @@
+@@ -53,12 +53,6 @@
+             <version>5.0.4</version>
             <scope>compile</scope>
         </dependency>
-         <dependency>
+-        <dependency>
 -            <groupId>jline</groupId>
 -            <artifactId>jline</artifactId>
 -            <version>2.12.1</version>
 -            <scope>compile</scope>
 -        </dependency>
-        <dependency>
+         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-             <version>3.19.3</version>
@@ -77,6 +71,38 @@
             <version>3.0.3</version>
             <scope>compile</scope>
@ -639,5 +639,5 @@ index 5cee8f00e..08b6bb7f9 100644
             <AppenderRef ref="TerminalConsole" level="info"/>
         </Root>
 -- 
-2.13.4
+2.14.1

--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@ -1 +1 @@
-Subproject commit 963b19c5995b14f8980a42f13b1bd693a5b411d1
+Subproject commit 357b573a19943118a96a8a76142dabd1cb6d9643