Update S

Spigot-API-Patches/0001-POM-changes.patch

@@ -1,4 +1,4 @@
-From 62d1a2a49930c3e5caf983081fbfa8262d5eb6dd Mon Sep 17 00:00:00 2001
+From e6590f041d0d90774eb4d5b24cbd0e83f8a1129b 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,11 +105,10 @@ index 31b8f93e..360d2f08 100644
          <plugins>
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
-@@ -118,26 +137,6 @@
-                     </dependency>
+@@ -119,26 +138,6 @@
                  </dependencies>
              </plugin>
--            <plugin>
+             <plugin>
 -                <groupId>org.codehaus.mojo</groupId>
 -                <artifactId>animal-sniffer-maven-plugin</artifactId>
 -                <version>1.15</version>
@@ -129,9 +128,10 @@ 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.14.1
+2.13.4
 

Spigot-API-Patches/0002-add-Trove-and-FastUtil-to-Bukkit.patch

@@ -1,4 +1,4 @@
-From 60ec55b1acbc4d95723b25e6c6209e541f1c8c0f Mon Sep 17 00:00:00 2001
+From 748238d525ac30269377a8ebd87d25324867d2db 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,11 +8,10 @@ diff --git a/pom.xml b/pom.xml
 index 360d2f08..c6bdf44e 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -55,6 +55,19 @@
-     </repositories>
+@@ -56,6 +56,19 @@
  
      <dependencies>
-+        <dependency>
+         <dependency>
 +            <groupId>net.sf.trove4j</groupId>
 +            <artifactId>trove4j</artifactId>
 +            <version>3.0.3</version>
@@ -25,9 +24,10 @@ 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.14.1
+2.13.4
 

Spigot-API-Patches/0006-Add-async-chunk-load-API.patch

@@ -1,4 +1,4 @@
-From 0cbfecff228b4248ddff45b9774891905cf2bf4a Mon Sep 17 00:00:00 2001
+From 80f89a9b8a58be1a4dd5d288b51ba88f66e97179 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,11 +8,10 @@ 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
-@@ -136,6 +136,78 @@ public interface World extends PluginMessageRecipient, Metadatable {
-      */
+@@ -137,6 +137,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.
@@ -84,9 +83,10 @@ 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.14.1
+2.13.4
 

Spigot-API-Patches/0032-Add-MetadataStoreBase.removeAll-Plugin.patch

@@ -1,4 +1,4 @@
-From deead5d94a52ef9bf9f10ca6bb8771cdcabb587f Mon Sep 17 00:00:00 2001
+From cf60d71f66765ec09cd221cd08bcab046e3c04c0 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,11 +9,10 @@ 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
-@@ -124,6 +124,26 @@ public abstract class MetadataStoreBase<T> {
-         }
+@@ -125,6 +125,26 @@ public abstract class MetadataStoreBase<T> {
      }
  
-+    /**
+     /**
 +     * Removes all metadata in the metadata store that originates from the
 +     * given plugin.
 +     *
@@ -33,9 +32,10 @@ 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.14.1
+2.13.4
 

Spigot-API-Patches/0041-Add-source-to-PlayerExpChangeEvent.patch

@@ -1,4 +1,4 @@
-From 3447c9fafd0cc6672197a3fc7c9d16de45269ef7 Mon Sep 17 00:00:00 2001
+From f824a6c4c45b5005fe1929e7fbf39d9eaf025074 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,20 +1,42 @@
+@@ -1,21 +1,43 @@
  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,9 +48,10 @@ index f37491d7..30882559 100644
 +    }
 +    // Paper end
 +
-     /**
++    /**
       * Get the amount of experience the player will receive
       *
+      * @return The amount of experience
 -- 
-2.14.1
+2.13.4