Move fastutil from a patch file to a library, and improve EAR

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

@@ -0,0 +1,33 @@
+From 95be64b105c7cc5e412441b55ef5257a9aacb660 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
+
+
+diff --git a/pom.xml b/pom.xml
+index a03865f..597f65c 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -48,6 +48,19 @@
+ 
+     <dependencies>
+         <dependency>
++            <groupId>net.sf.trove4j</groupId>
++            <artifactId>trove4j</artifactId>
++            <version>3.0.3</version>
++            <!-- Trove Provided by CraftBukkit -->
++            <scope>provided</scope>
++        </dependency>
++        <dependency>
++            <groupId>co.aikar</groupId>
++            <artifactId>fastutil-lite</artifactId>
++            <version>1.0</version>
++            <scope>provided</scope>
++        </dependency>
++        <dependency>
+             <groupId>commons-lang</groupId>
+             <artifactId>commons-lang</artifactId>
+             <version>2.6</version>
+-- 
+2.8.0
+

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

@@ -1,32 +1,9 @@
-From c06ec1a9abc604b79f3c0e282ca752814de91110 Mon Sep 17 00:00:00 2001
+From ec3f78348b95c24b1e62101a871c43136432f5bb 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
 
 
-diff --git a/pom.xml b/pom.xml
-index d916f44..d3a877a 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -1,4 +1,3 @@
--
- <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-     <modelVersion>4.0.0</modelVersion>
-@@ -48,6 +47,13 @@
- 
-     <dependencies>
-         <dependency>
-+            <groupId>net.sf.trove4j</groupId>
-+            <artifactId>trove4j</artifactId>
-+            <version>3.0.3</version>
-+            <!-- Trove Provided by CraftBukkit -->
-+            <scope>provided</scope>
-+        </dependency>
-+        <dependency>
-             <groupId>commons-lang</groupId>
-             <artifactId>commons-lang</artifactId>
-             <version>2.6</version>
 diff --git a/src/main/java/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java
 new file mode 100644
 index 0000000..cb4e7ba

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

@@ -1,4 +1,4 @@
-From e5e95709d29d23cb34387060e95de1aad352e432 Mon Sep 17 00:00:00 2001
+From 4c640a3a8199ea1b1653e9e03e65e4b6af3b4697 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 d3a877a..92a729b 100644
+index 597f65c..58ddcf3 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -112,6 +112,12 @@
+@@ -119,6 +119,12 @@
              <version>1.3</version>
              <scope>test</scope>
          </dependency>

Spigot-Server-Patches/0005-Timings-v2.patch

@@ -1,9 +1,26 @@
-From a2bec60dd78b081c7ad0a82fb03aee52dbab9284 Mon Sep 17 00:00:00 2001
+From 4979dcfaf9eb2d1d5b3533c429347ab0670e85aa 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
 
 
+diff --git a/pom.xml b/pom.xml
+index 8899e3a..3685721 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -65,6 +65,12 @@
+             <scope>compile</scope>
+         </dependency>
+         <dependency>
++            <groupId>co.aikar</groupId>
++            <artifactId>fastutil-lite</artifactId>
++            <version>1.0</version>
++            <scope>provided</scope>
++        </dependency>
++        <dependency>
+             <groupId>net.sf.trove4j</groupId>
+             <artifactId>trove4j</artifactId>
+             <version>3.0.3</version>
 diff --git a/src/main/java/co/aikar/timings/SpigotTimings.java b/src/main/java/co/aikar/timings/SpigotTimings.java
 new file mode 100644
 index 0000000..3f4271c

Spigot-Server-Patches/0055-EAR-Fix-bug-with-teleporting-entities.patch

@@ -1,4 +1,4 @@
-From 81633282d869e155958c376e88e245dc6f645bd0 Mon Sep 17 00:00:00 2001
+From 1d3116bd0f65f50f5b1fbfffa4d042cbc85cbb98 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 00:07:23 -0600
 Subject: [PATCH] EAR: Fix bug with teleporting entities
@@ -31,6 +31,19 @@ index 782abd6..359e18e 100644
      public boolean ah;
      public boolean impulse;
      public int portalCooldown;
+diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
+index bffa3ac..1a1f082 100644
+--- a/src/main/java/net/minecraft/server/World.java
++++ b/src/main/java/net/minecraft/server/World.java
+@@ -1623,7 +1623,7 @@ public abstract class World implements IBlockAccess {
+         byte b0 = 32;
+ 
+         // Spigot start
+-        if (!org.spigotmc.ActivationRange.checkIfActive(entity)) {
++        if (flag && !org.spigotmc.ActivationRange.checkIfActive(entity)) {
+             entity.ticksLived++;
+             entity.inactiveTick();
+         } else {
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
 index f0d3a19..a1bd1a6 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java

pom.xml

@@ -36,6 +36,10 @@
             <id>md_5-releases</id>
             <url>http://repo.md-5.net/content/repositories/releases/</url>
         </repository>
+        <repository>
+            <id>aikar</id>
+            <url>https://ci.emc.gs/nexus/content/repositories/aikar/</url>
+        </repository>
     </repositories>
 
     <distributionManagement>
@@ -48,4 +52,4 @@
             <url>https://repo.destroystokyo.com/content/repositories/snapshots/</url>
         </snapshotRepository>
     </distributionManagement>
-</project>
+</project>