Upstream update

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

@@ -1,11 +1,11 @@
-From 4bbb8c7aa24cea492d251eae531d0d88c1565b94 Mon Sep 17 00:00:00 2001
+From c61566569311803c43acb48153d515d4d9871c53 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
 
 
 diff --git a/pom.xml b/pom.xml
-index f175b611..2fe7b78e 100644
+index 31b8f93e..360d2f08 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,39 +3,39 @@
@@ -83,8 +83,8 @@ index f175b611..2fe7b78e 100644
      <dependencies>
          <dependency>
              <groupId>commons-lang</groupId>
-@@ -57,6 +68,13 @@
-             <type>jar</type>
+@@ -56,6 +67,13 @@
+             <version>1.1.1</version>
              <scope>compile</scope>
          </dependency>
 +        <!-- bundled with Minecraft, shouldn't ever change -->
@@ -97,7 +97,7 @@ index f175b611..2fe7b78e 100644
          <!-- bundled with Minecraft, should be kept in sync -->
          <dependency>
              <groupId>com.google.guava</groupId>
-@@ -101,6 +119,7 @@
+@@ -100,6 +118,7 @@
      </dependencies>
  
      <build>
@@ -105,7 +105,7 @@ index f175b611..2fe7b78e 100644
          <plugins>
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
-@@ -120,26 +139,6 @@
+@@ -119,26 +138,6 @@
                  </dependencies>
              </plugin>
              <plugin>
@@ -132,7 +132,7 @@ index f175b611..2fe7b78e 100644
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-shade-plugin</artifactId>
                  <version>3.0.0</version>
-@@ -152,6 +151,7 @@
+@@ -151,6 +150,7 @@
                      </execution>
                  </executions>
                  <configuration>
@@ -141,5 +141,5 @@ index f175b611..2fe7b78e 100644
                      <shadedArtifactAttached>true</shadedArtifactAttached>
                  </configuration>
 -- 
-2.13.4
+2.13.0
 

Spigot-API-Patches/0003-Timings-v2.patch

@@ -1,4 +1,4 @@
-From feb30e1e5157616d1a66269983609d6fa9dc3241 Mon Sep 17 00:00:00 2001
+From 98b1fecba12a6cdde5a5c08d9dc2a84851a7669b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 18:48:17 -0600
 Subject: [PATCH] Timings v2
@@ -2963,7 +2963,7 @@ index 00000000..df592d85
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 5649aaf7..b7c939a2 100644
+index eb6b7976..a9081ddb 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -523,7 +523,6 @@ public final class Bukkit {
@@ -2975,7 +2975,7 @@ index 5649aaf7..b7c939a2 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 7a08fd1e..7dd895a0 100644
+index 83b66361..bc3211f9 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -945,12 +945,27 @@ public interface Server extends PluginMessageRecipient {
@@ -3230,7 +3230,7 @@ index 71709126..b886cd82 100644
              // Note: we don't return the result of target.execute as thats success / failure, we return handled (true) or not handled (false)
 diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
 deleted file mode 100644
-index a8f61f2d..00000000
+index bba914d7..00000000
 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
 +++ /dev/null
 @@ -1,253 +0,0 @@
@@ -3360,7 +3360,7 @@ index a8f61f2d..00000000
 -            for (HandlerList handlerList : HandlerList.getHandlerLists()) {
 -                for (RegisteredListener listener : handlerList.getRegisteredListeners()) {
 -                    if (listener instanceof TimedRegisteredListener) {
--                        ((TimedRegisteredListener)listener).reset();
+-                        ((TimedRegisteredListener) listener).reset();
 -                    }
 -                }
 -            }
@@ -3504,7 +3504,7 @@ index bd2cc354..d2a78f56 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index a8b4db1c..de0ef125 100644
+index b3bcda52..041a4cd7 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -292,7 +292,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -3866,5 +3866,5 @@ index 8d982974..7e89b97b 100644
 -    }
  }
 -- 
-2.13.2
+2.13.0
 

Spigot-API-Patches/0018-Add-exception-reporting-event.patch

@@ -1,4 +1,4 @@
-From a10595b22bc0699a4ae1d75c993c30a278a1024c Mon Sep 17 00:00:00 2001
+From 04898a9642c98cc38ace2c8862794f1710081a7d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 20:24:35 -0600
 Subject: [PATCH] Add exception reporting event
@@ -458,7 +458,7 @@ index 00000000..5582999f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 39b275cb..6e9fc84f 100644
+index b886cd82..f1e9f200 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
 @@ -10,6 +10,9 @@ import java.util.List;
@@ -494,7 +494,7 @@ index 39b275cb..6e9fc84f 100644
      }
  
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index b43ffd36..d68e3bee 100644
+index 041a4cd7..68dd3332 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -18,6 +18,9 @@ import java.util.logging.Level;
@@ -553,7 +553,7 @@ index b43ffd36..d68e3bee 100644
              try {
                  server.getMessenger().unregisterIncomingPluginChannel(plugin);
                  server.getMessenger().unregisterOutgoingPluginChannel(plugin);
-             } catch(Throwable ex) {
+             } catch (Throwable ex) {
 -                server.getLogger().log(Level.SEVERE, "Error occurred (in the plugin loader) while unregistering plugin channels for " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
 +                handlePluginException("Error occurred (in the plugin loader) while unregistering plugin channels for "
 +                        + plugin.getDescription().getFullName() + " (Is it up to date?)", ex, plugin); // Paper
@@ -587,5 +587,5 @@ index b43ffd36..d68e3bee 100644
          }
      }
 -- 
-2.11.0
+2.13.0
 

Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch

@@ -1,4 +1,4 @@
-From 10a16475692e849a7707ad9d542df68bd9ace602 Mon Sep 17 00:00:00 2001
+From 780e7e1c25c5f7857d4ce5b834f07f4aef6f6814 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 13:20:33 -0700
 Subject: [PATCH] Use ASM for event executors.
@@ -6,10 +6,10 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.
 
 diff --git a/pom.xml b/pom.xml
-index 1e57d386..de5bc3f3 100644
+index c6bdf44e..31b6f51b 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -129,6 +129,12 @@
+@@ -128,6 +128,12 @@
              <version>1.3</version>
              <scope>test</scope>
          </dependency>
@@ -395,5 +395,5 @@ index d8b9c244..40fd71dc 100644
                  eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
              } else {
 -- 
-2.13.3.windows.1
+2.13.0