Merge branch 'pre/1.13' of https://github.com/PaperMC/Paper into AnvilDamageEvent

LICENSE.md

@@ -34,4 +34,6 @@ Brokkonaut <hannos17@gmx.de>
 vemacs <d@nkmem.es>
 stonar96 <minecraft.stonar96@gmail.com>
 Hugo Manrique <hugmanrique@gmail.com>
+Andrew Steinborn <git@steinborn.me>
+willies952002 <admin@domnian.com>
 ```

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

@@ -1,11 +1,11 @@
-From 7439e7e3c94eb559415193440a9e1515335819c7 Mon Sep 17 00:00:00 2001
+From 012c183c1c668f4ab31e7b6e0e6ae61005127510 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 3e6c8707..c2d0651e 100644
+index e946bccf..7374304f 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,29 +3,35 @@
@@ -21,7 +21,7 @@ index 3e6c8707..c2d0651e 100644
 +    </parent>
 +
 +    <artifactId>paper-api</artifactId>
-     <version>1.13-pre7-R0.1-SNAPSHOT</version>
+     <version>1.13-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Spigot-API</name>

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

@@ -1,4 +1,4 @@
-From dfdc0fc72aa42183a2d88cec42f0f08bcb1d474c Mon Sep 17 00:00:00 2001
+From f8fa09d5b8cbff7c0ce49d3fab5352ecdecb6172 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
@@ -3004,7 +3004,7 @@ index 00000000..df592d85
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 0f42a66a..68b5e1c9 100644
+index ff7f436c..b56c09d3 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -525,7 +525,6 @@ public final class Bukkit {
@@ -3016,10 +3016,10 @@ index 0f42a66a..68b5e1c9 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 053a24dc..0d41f7db 100644
+index a766ee96..4ddb8b02 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1011,12 +1011,27 @@ public interface Server extends PluginMessageRecipient {
+@@ -1037,12 +1037,27 @@ public interface Server extends PluginMessageRecipient {
      // Spigot start
      public class Spigot
      {

Spigot-API-Patches/0005-Add-getTPS-method.patch

@@ -1,14 +1,14 @@
-From ff3b42f8a992f43e1a65e70f750f489168d633bd Mon Sep 17 00:00:00 2001
+From 5afd01f2ac262d4c1074c7eacb0550eebb115731 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 17:24:57 -0600
 Subject: [PATCH] Add getTPS method
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 68b5e1c9..f3252e20 100644
+index b56c09d3..477a5833 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1127,6 +1127,16 @@ public final class Bukkit {
+@@ -1153,6 +1153,16 @@ public final class Bukkit {
          return server.getEntity(uuid);
      }
  
@@ -26,10 +26,10 @@ index 68b5e1c9..f3252e20 100644
       * Get the advancement specified by this key.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 331bb061..eb98c600 100644
+index 4ddb8b02..1fa6f53e 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -921,6 +921,15 @@ public interface Server extends PluginMessageRecipient {
+@@ -947,6 +947,15 @@ public interface Server extends PluginMessageRecipient {
       */
      Entity getEntity(UUID uuid);
  

Spigot-API-Patches/0006-Entity-Origin-API.patch

@@ -1,4 +1,4 @@
-From 4e2445c63fba52523da6ce11e8cf8a241cf593f3 Mon Sep 17 00:00:00 2001
+From ac7a0eff76dedc21f1bc6fc1eb0d6cbb367f6f90 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 17:50:31 -0600
 Subject: [PATCH] Entity Origin API
@@ -25,10 +25,10 @@ index 28b169d2..9b0f97f1 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
-index 9d34e691..b0b1defc 100644
+index 0cd830d9..170a9aee 100644
 --- a/src/main/java/org/bukkit/entity/FallingBlock.java
 +++ b/src/main/java/org/bukkit/entity/FallingBlock.java
-@@ -52,4 +52,15 @@ public interface FallingBlock extends Entity {
+@@ -51,4 +51,15 @@ public interface FallingBlock extends Entity {
       * @param hurtEntities whether entities will be damaged by this block.
       */
      void setHurtEntities(boolean hurtEntities);

Spigot-API-Patches/0008-Add-PlayerLocaleChangeEvent.patch

@@ -1,4 +1,4 @@
-From 501e01d868ec3f41f8aa3a1bebc83b4305723b42 Mon Sep 17 00:00:00 2001
+From 2ee52b020013ad95861d196908450fa2fc227431 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Mon, 29 Feb 2016 18:02:25 -0600
 Subject: [PATCH] Add PlayerLocaleChangeEvent
@@ -61,5 +61,5 @@ index 00000000..29dd763a
 +    }
 +}
 -- 
-2.18.0
+2.17.0 (Apple Git-106)
 

Spigot-API-Patches/0009-Add-player-view-distance-API.patch

@@ -1,4 +1,4 @@
-From a046e06ee22190a42f8ec203d7b106a9271c09f2 Mon Sep 17 00:00:00 2001
+From 3308624206985251b7646042a4276f026c169c0b Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 18:05:37 -0600
 Subject: [PATCH] Add player view distance API
@@ -30,5 +30,5 @@ index 25e44028..7f215f1a 100644
      public class Spigot extends Entity.Spigot
      {
 -- 
-2.18.0
+2.17.0 (Apple Git-106)
 

Spigot-API-Patches/0010-Add-BeaconEffectEvent.patch

@@ -1,4 +1,4 @@
-From e9e1ec6471574850b8eb0cd61bb019a05d7adbb2 Mon Sep 17 00:00:00 2001
+From b0d2313841c2f617773d33708aaca8fece34d75c Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 18:09:40 -0600
 Subject: [PATCH] Add BeaconEffectEvent
@@ -92,5 +92,5 @@ index 00000000..6579ae99
 +    }
 +}
 -- 
-2.18.0
+2.17.0 (Apple Git-106)
 

Spigot-API-Patches/0012-Automatically-disable-plugins-that-fail-to-load.patch

@@ -1,4 +1,4 @@
-From 283da38a9b2ea8a978ea570e8446f487caaf6f10 Mon Sep 17 00:00:00 2001
+From 9a230e904d502c69610fe0507d3bbaabc19cd059 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 19:45:21 -0600
 Subject: [PATCH] Automatically disable plugins that fail to load

Spigot-API-Patches/0012-Made-EntityDismountEvent-Cancellable.patch

@@ -1,47 +0,0 @@
-From 8afe8ac5e2901bf492b1465e4a5ec43117bebdc2 Mon Sep 17 00:00:00 2001
-From: Nik Gil <nikmanG@users.noreply.github.com>
-Date: Mon, 29 Feb 2016 19:42:10 -0600
-Subject: [PATCH] Made EntityDismountEvent Cancellable
-
-
-diff --git a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
-index 24d4942a..ce989bb1 100644
---- a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
-+++ b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
-@@ -1,6 +1,7 @@
- package org.spigotmc.event.entity;
- 
- import org.bukkit.entity.Entity;
-+import org.bukkit.event.Cancellable;
- import org.bukkit.event.HandlerList;
- import org.bukkit.event.entity.EntityEvent;
- 
-@@ -8,7 +9,7 @@ import org.bukkit.event.entity.EntityEvent;
-  * Called when an entity stops riding another entity.
-  *
-  */
--public class EntityDismountEvent extends EntityEvent
-+public class EntityDismountEvent extends EntityEvent implements Cancellable // Paper - implement Cancellable
- {
- 
-     private static final HandlerList handlers = new HandlerList();
-@@ -36,4 +37,16 @@ public class EntityDismountEvent extends EntityEvent
-     {
-         return handlers;
-     }
-+
-+    // Paper start - Implement cancellable methods
-+    @Override
-+    public boolean isCancelled() {
-+        return cancelled;
-+    }
-+
-+    @Override
-+    public void setCancelled(boolean cancelled) {
-+        this.cancelled = cancelled;
-+    }
-+    // Paper end
- }
--- 
-2.18.0
-

Spigot-API-Patches/0013-Expose-server-CommandMap.patch

@@ -1,11 +1,11 @@
-From d7b3294ee2ca409a7de9da69d863974ee1823872 Mon Sep 17 00:00:00 2001
+From a16608e4c4b20cad5477b8be0c935581a1d0895f Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Mon, 29 Feb 2016 19:48:59 -0600
 Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index f3252e20..a291ebd6 100644
+index 477a5833..73c85063 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -19,10 +19,7 @@ import org.bukkit.boss.BarColor;
@@ -20,7 +20,7 @@ index f3252e20..a291ebd6 100644
  import org.bukkit.entity.Entity;
  import org.bukkit.entity.Player;
  import org.bukkit.event.inventory.InventoryType;
-@@ -1237,6 +1234,17 @@ public final class Bukkit {
+@@ -1263,6 +1260,17 @@ public final class Bukkit {
          return server.getUnsafe();
      }
  
@@ -39,7 +39,7 @@ index f3252e20..a291ebd6 100644
      {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index eb98c600..2b43ac1f 100644
+index 1fa6f53e..70e19580 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -19,10 +19,7 @@ import org.bukkit.boss.BarColor;
@@ -54,7 +54,7 @@ index eb98c600..2b43ac1f 100644
  import org.bukkit.entity.Entity;
  import org.bukkit.entity.Player;
  import org.bukkit.event.inventory.InventoryType;
-@@ -930,6 +927,14 @@ public interface Server extends PluginMessageRecipient {
+@@ -956,6 +953,14 @@ public interface Server extends PluginMessageRecipient {
      public double[] getTPS();
      // Paper end
  

Spigot-API-Patches/0014-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch

@@ -1,4 +1,4 @@
-From 3b0d21ce147ba8825a3e5b64923a11d1a81fdbbf Mon Sep 17 00:00:00 2001
+From 25d86246284e115f6bc1aa65fc26dac0e77de5fa Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 19:54:32 -0600
 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
@@ -37,7 +37,7 @@ index a291ebd6..0844862c 100644
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 2b43ac1f..d8ce8173 100644
+index 901199e3..1ad2cba4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -228,6 +228,26 @@ public interface Server extends PluginMessageRecipient {

Spigot-API-Patches/0015-Player-Tab-List-and-Title-APIs.patch

@@ -1,4 +1,4 @@
-From e5ee86a01a83c6c38f2ad58a4e534af73d54847c Mon Sep 17 00:00:00 2001
+From fa4c0456f5dd7abf1913952d44e859ebfdd61069 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Mon, 29 Feb 2016 20:02:40 -0600
 Subject: [PATCH] Player Tab List and Title APIs
@@ -498,5 +498,5 @@ index f4d1ade5..65b7a076 100644
  
      /**
 -- 
-2.18.0
+2.17.0 (Apple Git-106)
 

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

@@ -1,4 +1,4 @@
-From ec5c5dcdcd3e5a6dd7a4d5620c73274f94071b80 Mon Sep 17 00:00:00 2001
+From 487fd736664c77fdc1da6257aadc398d7e9cdac3 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

Spigot-API-Patches/0017-Fix-ServerListPingEvent-flagging-as-Async.patch

@@ -1,4 +1,4 @@
-From 8f1e66f25039c51d7e83c9c9ffae25ac434acb2b Mon Sep 17 00:00:00 2001
+From cb1afe86f6ab48949d4e19d3549a4669b1ceae28 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 20:26:39 -0600
 Subject: [PATCH] Fix ServerListPingEvent flagging as Async

Spigot-API-Patches/0018-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch

@@ -1,4 +1,4 @@
-From 4d1f4491596b61d5a58c4446d1a58954e53b1f1d Mon Sep 17 00:00:00 2001
+From 5c6c0d9b5742c5c31017b1951334b325b04faac0 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 8 Mar 2016 13:05:59 -0800
 Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender

Spigot-API-Patches/0019-Add-methods-for-working-with-arrows-stuck-in-living-.patch

@@ -1,4 +1,4 @@
-From 70a25e1acdf0f9edfdde947fdb97aef644535ee3 Mon Sep 17 00:00:00 2001
+From a2e517e59ee21c1ce489f3917b75bcb8a94d1bea Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:47:27 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities

Spigot-API-Patches/0020-Complete-resource-pack-API.patch

@@ -1,4 +1,4 @@
-From 1d993cf07f29d709b5cae8a3e04528675d7e7aea Mon Sep 17 00:00:00 2001
+From b2c4a432b883c52071cb4b538f1f117ea62d7a2e Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 22:59:54 -0400
 Subject: [PATCH] Complete resource pack API

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

@@ -1,4 +1,4 @@
-From 1469b97863ed5e841689d1347d6183189fef27cb Mon Sep 17 00:00:00 2001
+From cf7ba1c723ee537f7bbc7cc8d339d6357e5f0694 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,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.
 
 diff --git a/pom.xml b/pom.xml
-index 5e2024ca..bd9146dd 100644
+index a8a87820..a58d4424 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -127,6 +127,17 @@

Spigot-API-Patches/0022-Add-a-call-helper-to-Event.patch

@@ -1,4 +1,4 @@
-From e9cc1e95622f2b2f51b02a3a0b32911c3c760613 Mon Sep 17 00:00:00 2001
+From b6c1b5a967f036414fecc13493846b18a6c60ffe Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 19 May 2013 20:36:58 -0400
 Subject: [PATCH] Add a call helper to Event

Spigot-API-Patches/0023-Add-sender-name-to-commands.yml-replacement.patch

@@ -1,4 +1,4 @@
-From b5c4f4748f637c8ddccffbcdef249b4abe7f4401 Mon Sep 17 00:00:00 2001
+From 77a78428fcc16fb82c0a2e0d2173db22a1476266 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 22 Jul 2015 18:50:41 -0400
 Subject: [PATCH] Add sender name to commands.yml replacement

Spigot-API-Patches/0024-Add-command-to-reload-permissions.yml-and-require-co.patch

@@ -1,4 +1,4 @@
-From 1a2b3bc3c46affceeb6ae0f93d166778eabba78b Mon Sep 17 00:00:00 2001
+From 4df7359ab8d56f067a1373cd77a35c2ea2ed28d9 Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:28:07 -0400
 Subject: [PATCH] Add command to reload permissions.yml and require confirm to
@@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 0844862c..bce4ba1b 100644
+index 471ae811..d6686820 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1263,6 +1263,13 @@ public final class Bukkit {
+@@ -1289,6 +1289,13 @@ public final class Bukkit {
      public static CommandMap getCommandMap() {
          return server.getCommandMap();
      }
@@ -24,10 +24,10 @@ index 0844862c..bce4ba1b 100644
  
      public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 1ad2cba4..b6a2141c 100644
+index 56b0fdb5..5a4528c4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1094,4 +1094,6 @@ public interface Server extends PluginMessageRecipient {
+@@ -1120,4 +1120,6 @@ public interface Server extends PluginMessageRecipient {
  
      Spigot spigot();
      // Spigot end

Spigot-API-Patches/0025-Custom-replacement-for-eaten-items.patch

@@ -1,4 +1,4 @@
-From c92da34fc23a3a8c4bd298cf1e752b43ce81a88a Mon Sep 17 00:00:00 2001
+From 9b4d4b26e75b1e6467c11da7432ba08453689686 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:05:21 -0400
 Subject: [PATCH] Custom replacement for eaten items

Spigot-API-Patches/0026-Access-items-by-EquipmentSlot.patch

@@ -1,4 +1,4 @@
-From ad5444f104e8943b5cd8fe2110dfa6e74c47ab0c Mon Sep 17 00:00:00 2001
+From a4f2ef92d3cb775e916cbf50f2613f901b0e07e3 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 20 Mar 2016 06:44:49 -0400
 Subject: [PATCH] Access items by EquipmentSlot

Spigot-API-Patches/0027-Entity-AddTo-RemoveFrom-World-Events.patch

@@ -1,4 +1,4 @@
-From d66b6b3d8cf42eee8c7d432bfeeb8618eb1c3125 Mon Sep 17 00:00:00 2001
+From db294a56ff3cbb40493caea0ce0506dc6261de4d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:26:34 -0400
 Subject: [PATCH] Entity AddTo/RemoveFrom World Events

Spigot-API-Patches/0028-EntityPathfindEvent.patch

@@ -1,4 +1,4 @@
-From e3f57f03c3b0a7dfb8399bc60c9854d7c5369397 Mon Sep 17 00:00:00 2001
+From 0f4f69d6a81d66c4906f1c05cac664bbdb129cf7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:15:34 -0400
 Subject: [PATCH] EntityPathfindEvent

Spigot-API-Patches/0029-Reduce-thread-synchronization-in-MetadataStoreBase.patch

@@ -1,4 +1,4 @@
-From c0a5945074128db7e77a353aa9035b7d0f01acb7 Mon Sep 17 00:00:00 2001
+From 9cd7b0f5a8832c7d1b3db973c9f65db555013762 Mon Sep 17 00:00:00 2001
 From: crast <contact@jamescrasta.com>
 Date: Sat, 1 Jun 2013 13:52:30 -0600
 Subject: [PATCH] Reduce thread synchronization in MetadataStoreBase

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

@@ -1,4 +1,4 @@
-From ff8d88096d58f9f801a4d6b49ef0eede65667989 Mon Sep 17 00:00:00 2001
+From 9a9ae4bff73c2649084dc753efa60f86ac91c2dd 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)

Spigot-API-Patches/0031-Add-PlayerUseUnknownEntityEvent.patch

@@ -1,4 +1,4 @@
-From 97a35e82ddb729fd74ce6d252a2c928a24b39d55 Mon Sep 17 00:00:00 2001
+From 57f2ba957f3cf3753fdf4f51697cda7e52daefc7 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:08:36 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent

Spigot-API-Patches/0032-Add-handshake-event-to-allow-plugins-to-handle-clien.patch

@@ -1,4 +1,4 @@
-From 7c3fcd8ee8df766361c426d25955b626eac60d88 Mon Sep 17 00:00:00 2001
+From 4e0abf8c461a8e517fa30a281d90f8c60bd5686a Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 13 Apr 2016 20:20:18 -0700
 Subject: [PATCH] Add handshake event to allow plugins to handle client

Spigot-API-Patches/0033-Arrow-pickup-rule-API.patch

@@ -1,4 +1,4 @@
-From 19fcaea4b23887be2eaa4d5e5bded0fa3ceca3ab Mon Sep 17 00:00:00 2001
+From 57f8f2e8bfc9419a07a28ad20fb52c13ee3e5562 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Fri, 4 Mar 2016 03:13:18 -0500
 Subject: [PATCH] Arrow pickup rule API

Spigot-API-Patches/0034-EntityRegainHealthEvent-isFastRegen-API.patch

@@ -1,4 +1,4 @@
-From 49a798ea1efd88482f5860292339b3229ebbf877 Mon Sep 17 00:00:00 2001
+From 8121678797e7b682fc53643ab34992d1aeacba8d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 01:43:11 -0500
 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API

Spigot-API-Patches/0035-LootTable-API.patch

@@ -1,4 +1,4 @@
-From 47d3999f281a9271cec4bdec2cc226b05d3ebf40 Mon Sep 17 00:00:00 2001
+From 4f1dc63c147f7ba3ae36ad4c04f55c852ae84dd7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 15:19:49 -0400
 Subject: [PATCH] LootTable API

Spigot-API-Patches/0036-Add-EntityZapEvent.patch

@@ -1,4 +1,4 @@
-From fa59003d856eb5f54a4a9bf0a26b7e55ae3a0713 Mon Sep 17 00:00:00 2001
+From 8cfb250c7604959047200370c281919b0ae0c420 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:34 -0700
 Subject: [PATCH] Add EntityZapEvent

Spigot-API-Patches/0037-Misc-Utils.patch

@@ -1,4 +1,4 @@
-From ae850cec0afe270d11a66245c0d9e46a16339283 Mon Sep 17 00:00:00 2001
+From f3a8ebcad45891f6cb7d243095d3739c1f1980d2 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 12:53:43 -0500
 Subject: [PATCH] Misc Utils

Spigot-API-Patches/0038-Allow-Reloading-of-Command-Aliases.patch

@@ -1,4 +1,4 @@
-From 5573a13dbba10bfedcf8610d255a13293bda79bd Mon Sep 17 00:00:00 2001
+From 2eaf589a9abaea57928f1d5ceecb1e404999a090 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:16:39 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index bce4ba1b..70495c15 100644
+index d6686820..35e18341 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1270,6 +1270,15 @@ public final class Bukkit {
+@@ -1296,6 +1296,15 @@ public final class Bukkit {
      public static void reloadPermissions() {
          server.reloadPermissions();
      }
@@ -26,10 +26,10 @@ index bce4ba1b..70495c15 100644
  
      public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b6a2141c..94d709f4 100644
+index 5a4528c4..12efd654 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1096,4 +1096,6 @@ public interface Server extends PluginMessageRecipient {
+@@ -1122,4 +1122,6 @@ public interface Server extends PluginMessageRecipient {
      // Spigot end
  
      void reloadPermissions(); // Paper

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

@@ -1,4 +1,4 @@
-From e08937fe0886d2dbce1bdb74980b7cdbc778e628 Mon Sep 17 00:00:00 2001
+From 47a6be4ee58f0b7650ee3f74933311d0e0dbab0e 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

Spigot-API-Patches/0040-Add-ProjectileCollideEvent.patch

@@ -1,4 +1,4 @@
-From da74019f26ab71c97991b2cf3474bc40a2c63bce Mon Sep 17 00:00:00 2001
+From 4eac0975455ab0ef81f5dac6bf83d475951f9a81 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent

Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch

@@ -1,4 +1,4 @@
-From d1c10cb8d00c3b6e9c8612bc30e9e7a715dd1ecf Mon Sep 17 00:00:00 2001
+From 12f234e11bae353a39c478f79e9d4c640b004c0e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:55:55 -0500
 Subject: [PATCH] Add String based Action Bar API

Spigot-API-Patches/0042-Add-API-methods-to-control-if-armour-stands-can-move.patch

@@ -1,4 +1,4 @@
-From 3c437859f9ef78609aac37e3afe173588ae67ee9 Mon Sep 17 00:00:00 2001
+From 718a96c9c13faf9b22291e81c70b0170fd4a0501 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:47:25 -0600
 Subject: [PATCH] Add API methods to control if armour stands can move

Spigot-API-Patches/0043-IllegalPacketEvent.patch

@@ -1,4 +1,4 @@
-From dea71c291e5e4139c86b7570e6eed8897bde2e94 Mon Sep 17 00:00:00 2001
+From 0f595a2260083d3940ed487003e0351bb75aa1a5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 4 Dec 2016 01:19:14 -0500
 Subject: [PATCH] IllegalPacketEvent

Spigot-API-Patches/0044-Fireworks-API-s.patch

@@ -1,4 +1,4 @@
-From 6705469275b33dd3cbb08048e0226fbca6c8599d Mon Sep 17 00:00:00 2001
+From 8e86bdb38a51cea9f5b62c820732617366fce895 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 28 Dec 2016 01:18:55 -0500
 Subject: [PATCH] Fireworks API's

Spigot-API-Patches/0045-PlayerTeleportEndGatewayEvent.patch

@@ -1,4 +1,4 @@
-From f0f71311d0761cfb9c8ba1c5901f3e29223994ad Mon Sep 17 00:00:00 2001
+From 718717b647158518a34c36bb8e5623d838e88e29 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 31 Dec 2016 20:29:33 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent

Spigot-API-Patches/0046-Provide-E-TE-Chunk-count-stat-methods.patch

@@ -1,4 +1,4 @@
-From 33b64ea35d49023c95c359e7c8664335e202f7c0 Mon Sep 17 00:00:00 2001
+From 9e7f9915a3c7e0c57d407ff884ef4262aea8568b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:23:03 -0500
 Subject: [PATCH] Provide E/TE/Chunk count stat methods

Spigot-API-Patches/0047-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch

@@ -1,4 +1,4 @@
-From 0e3f92f938875e2030ff8e1b7f559ecddca777f7 Mon Sep 17 00:00:00 2001
+From a5987f0c76258d3d57fe1611b8355438ebbcc058 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:28:32 -0500
 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player

Spigot-API-Patches/0048-Expose-WorldBorder-isInBounds-Location-check.patch

@@ -1,4 +1,4 @@
-From 0187592c026f6b460628219f3f2c4e48e9413bfc Mon Sep 17 00:00:00 2001
+From 2938561e612928e665b3e9db9f50e44d5284970e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 21 Jan 2017 17:03:10 -0600
 Subject: [PATCH] Expose WorldBorder#isInBounds(Location) check

Spigot-API-Patches/0049-Add-configuration-option-to-prevent-player-names-fro.patch

@@ -1,4 +1,4 @@
-From bb52f66da14375368ceff766b8cf92decd2caada Mon Sep 17 00:00:00 2001
+From 2ac7131971cf62c416974a622be676b1e55ff205 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Fri, 9 Jun 2017 07:24:24 -0700
 Subject: [PATCH] Add configuration option to prevent player names from being
@@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 70495c15..c918d67c 100644
+index 35e18341..9558645f 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1279,6 +1279,16 @@ public final class Bukkit {
+@@ -1305,6 +1305,16 @@ public final class Bukkit {
      public static boolean reloadCommandAliases() {
          return server.reloadCommandAliases();
      }
@@ -27,10 +27,10 @@ index 70495c15..c918d67c 100644
  
      public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 94d709f4..96044f4b 100644
+index 12efd654..da0d08b3 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1098,4 +1098,14 @@ public interface Server extends PluginMessageRecipient {
+@@ -1124,4 +1124,14 @@ public interface Server extends PluginMessageRecipient {
      void reloadPermissions(); // Paper
  
      boolean reloadCommandAliases(); // Paper

Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch

@@ -1,4 +1,4 @@
-From 95cc7e013040f4cc243d1d421ec2d8a62dacbfa2 Mon Sep 17 00:00:00 2001
+From 6bd3a5ad8d74d0174b70ec10216020d6f7c1206d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 10 Jun 2017 16:59:40 -0500
 Subject: [PATCH] Fix upstream javadoc warnings and errors
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix upstream javadoc warnings and errors
 Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
 
 diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java
-index 1ed8f7e4..bd5238ce 100644
+index 43239f84..fe8d3468 100644
 --- a/src/main/java/org/bukkit/NamespacedKey.java
 +++ b/src/main/java/org/bukkit/NamespacedKey.java
 @@ -38,8 +38,8 @@ public final class NamespacedKey {

Spigot-API-Patches/0051-Item-canEntityPickup.patch

@@ -1,4 +1,4 @@
-From dc66c4f09cb93dc94893badd5da732ed2178aa45 Mon Sep 17 00:00:00 2001
+From 360118be75c9c955ddc56da1a41976f2238136af Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 5 May 2017 03:57:08 -0500
 Subject: [PATCH] Item#canEntityPickup

Spigot-API-Patches/0052-PlayerPickupItemEvent-setFlyAtPlayer.patch

@@ -1,4 +1,4 @@
-From d9917e835f1e81e0b7d84ffc7ea4b60ca08eb3c4 Mon Sep 17 00:00:00 2001
+From 158701799346c25d8daf92beb3fb9c59922c3aec Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 May 2017 06:26:01 -0500
 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer

Spigot-API-Patches/0053-PlayerAttemptPickupItemEvent.patch

@@ -1,4 +1,4 @@
-From 1f46a8b98f035e8a17ccef525526dc0d02b7acbb Mon Sep 17 00:00:00 2001
+From b989dc1168c035e24f94e0ff25514d579e52f6f7 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 11 Jun 2017 16:30:37 -0500
 Subject: [PATCH] PlayerAttemptPickupItemEvent

Spigot-API-Patches/0054-Add-UnknownCommandEvent.patch

@@ -1,4 +1,4 @@
-From d8cb5d408bac83ef3e7e83da92cc90904d4cd379 Mon Sep 17 00:00:00 2001
+From 170f61cabc9f329e6a4159b4a9dc9db4a5d76836 Mon Sep 17 00:00:00 2001
 From: Sweepyoface <github@sweepy.pw>
 Date: Sat, 17 Jun 2017 18:48:06 -0400
 Subject: [PATCH] Add UnknownCommandEvent

Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch

@@ -1,4 +1,4 @@
-From 2a6044898ccb64c5c3bd65f556ec5e93834917b2 Mon Sep 17 00:00:00 2001
+From bdcaf28a89037f365f2f9020eae7a11d8fe5080e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 15 Jan 2018 21:46:46 -0500
 Subject: [PATCH] Basic PlayerProfile API
@@ -7,14 +7,12 @@ Provides basic elements of a PlayerProfile to be used by future API/events
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
 new file mode 100644
-index 00000000..e060c38a
+index 00000000..1a69e5f7
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
-@@ -0,0 +1,149 @@
+@@ -0,0 +1,141 @@
 +package com.destroystokyo.paper.profile;
 +
-+import com.mojang.authlib.GameProfile;
-+
 +import javax.annotation.Nonnull;
 +import javax.annotation.Nullable;
 +import java.util.Collection;
@@ -153,12 +151,6 @@ index 00000000..e060c38a
 +    default boolean hasTextures() {
 +        return hasProperty("textures");
 +    }
-+
-+    /**
-+     * @deprecated Will be removed in 1.13
-+     */
-+    @Deprecated
-+    GameProfile getGameProfile();
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
 new file mode 100644
@@ -239,7 +231,7 @@ index 00000000..d17061e6
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index c918d67c..01a226d9 100644
+index 9558645f..86e72f95 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -46,6 +46,9 @@ import org.bukkit.generator.ChunkGenerator;
@@ -252,7 +244,7 @@ index c918d67c..01a226d9 100644
  /**
   * Represents the Bukkit core, for version and Server singleton handling
   */
-@@ -1289,6 +1292,37 @@ public final class Bukkit {
+@@ -1315,6 +1318,37 @@ public final class Bukkit {
      public static boolean suggestPlayerNamesWhenNullTabCompletions() {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
@@ -291,7 +283,7 @@ index c918d67c..01a226d9 100644
  
      public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 96044f4b..6c96fc14 100644
+index da0d08b3..878255a4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -47,6 +47,9 @@ import org.bukkit.generator.ChunkGenerator;
@@ -304,7 +296,7 @@ index 96044f4b..6c96fc14 100644
  /**
   * Represents a server implementation.
   */
-@@ -1107,5 +1110,30 @@ public interface Server extends PluginMessageRecipient {
+@@ -1133,5 +1136,30 @@ public interface Server extends PluginMessageRecipient {
       * @return true if player names should be suggested
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();

Spigot-API-Patches/0056-Shoulder-Entities-Release-API.patch

@@ -1,4 +1,4 @@
-From 495ea88275a4d9b96efb1db20a52c4566f3458e5 Mon Sep 17 00:00:00 2001
+From cde8228c35b12307dc50eb03eb3550aa2f41c485 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:04:51 -0400
 Subject: [PATCH] Shoulder Entities Release API

Spigot-API-Patches/0057-Profile-Lookup-Events.patch

@@ -1,4 +1,4 @@
-From c836087cd8822e93732c4f292489a13b77223a89 Mon Sep 17 00:00:00 2001
+From 97ffcb9256d9f121a14c42cfc8142f250bafac71 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 16:30:44 -0400
 Subject: [PATCH] Profile Lookup Events
@@ -6,34 +6,15 @@ Subject: [PATCH] Profile Lookup Events
 Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in profile data, and cache the responses from
 profiles that had to be looked up.
 
-diff --git a/pom.xml b/pom.xml
-index bd9146dd..44a8b2a5 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -61,6 +61,13 @@
-             <!-- Trove Provided by CraftBukkit -->
-             <scope>provided</scope>
-         </dependency>
-+        <!-- Paper - Add Authlib for Profile API -->
-+        <dependency>
-+            <groupId>com.mojang</groupId>
-+            <artifactId>authlib</artifactId>
-+            <version>1.5.25</version> <!-- keep in sync with major MC versions -->
-+            <scope>compile</scope> <!-- expose to Plugins -->
-+        </dependency>
-         <dependency>
-             <groupId>co.aikar</groupId>
-             <artifactId>fastutil-lite</artifactId>
 diff --git a/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java
 new file mode 100644
-index 00000000..3b6995a7
+index 00000000..160c98fe
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java
-@@ -0,0 +1,55 @@
+@@ -0,0 +1,44 @@
 +package com.destroystokyo.paper.event.profile;
 +
 +import com.destroystokyo.paper.profile.PlayerProfile;
-+import com.mojang.authlib.GameProfile;
 +import org.bukkit.Bukkit;
 +import org.bukkit.event.Event;
 +import org.bukkit.event.HandlerList;
@@ -60,16 +41,6 @@ index 00000000..3b6995a7
 +
 +    /**
 +     * @return The profile that was recently looked up. This profile can be mutated
-+     * @deprecated will be removed with 1.13, use {@link #getPlayerProfile()}
-+     */
-+    @Deprecated
-+    @Nonnull
-+    public GameProfile getProfile() {
-+        return profile.getGameProfile();
-+    }
-+
-+    /**
-+     * @return The profile that was recently looked up. This profile can be mutated
 +     */
 +    @Nonnull
 +    public PlayerProfile getPlayerProfile() {
@@ -87,17 +58,15 @@ index 00000000..3b6995a7
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java
 new file mode 100644
-index 00000000..aa0666d5
+index 00000000..e5a5986a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java
-@@ -0,0 +1,149 @@
+@@ -0,0 +1,105 @@
 +package com.destroystokyo.paper.event.profile;
 +
 +import com.destroystokyo.paper.profile.PlayerProfile;
 +import com.destroystokyo.paper.profile.ProfileProperty;
 +import com.google.common.collect.ArrayListMultimap;
-+import com.google.common.collect.Multimap;
-+import com.mojang.authlib.properties.Property;
 +import org.bukkit.Bukkit;
 +import org.bukkit.event.Event;
 +import org.bukkit.event.HandlerList;
@@ -162,48 +131,6 @@ index 00000000..aa0666d5
 +    }
 +
 +    /**
-+     * Get the properties for this profile
-+     *
-+     * @return the property map to attach to the new {@link PlayerProfile}
-+     * @deprecated will be removed with 1.13  Use {@link #getProfileProperties()}
-+     */
-+    @Deprecated
-+    @Nonnull
-+    public Multimap<String, Property> getProperties() {
-+        Multimap<String, Property> props = ArrayListMultimap.create();
-+
-+        for (ProfileProperty property : properties) {
-+            props.put(property.getName(), new Property(property.getName(), property.getValue(), property.getSignature()));
-+        }
-+        return props;
-+    }
-+
-+    /**
-+     * Completely replaces all Properties with the new provided properties
-+     * @param properties the properties to set on the new profile
-+     * @deprecated will be removed with 1.13 Use {@link #setProfileProperties(Set)}
-+     */
-+    @Deprecated
-+    public void setProperties(Multimap<String, Property> properties) {
-+        this.properties = new HashSet<>();
-+        properties.values().forEach(property -> {
-+            this.properties.add(new ProfileProperty(property.getName(), property.getValue(), property.getSignature()));
-+        });
-+    }
-+
-+    /**
-+     * Adds additional properties, without removing the original properties
-+     * @param properties the properties to add to the existing properties
-+     * @deprecated will be removed with 1.13 use {@link #addProfileProperties(Set)}
-+     */
-+    @Deprecated
-+    public void addProperties(Multimap<String, Property> properties) {
-+        properties.values().forEach(property -> {
-+            this.properties.add(new ProfileProperty(property.getName(), property.getValue(), property.getSignature()));
-+        });
-+    }
-+
-+    /**
 +     * @return The currently pending prepopulated properties.
 +     * Any property in this Set will be automatically prefilled on this Profile
 +     */

Spigot-API-Patches/0058-Entity-fromMobSpawner.patch

@@ -1,4 +1,4 @@
-From 0a3125353c085b5a16edb538480d5f712a6afde3 Mon Sep 17 00:00:00 2001
+From d12b4647862ab81272f1030da1a9fbeb2e7d30b1 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()

Spigot-API-Patches/0059-Improve-the-Saddle-API-for-Horses.patch

@@ -1,4 +1,4 @@
-From 233f6d000f7fa14bd2de6d6c5ba88cd4b9dc4170 Mon Sep 17 00:00:00 2001
+From 93347de85dca36fb232ea77c2c767563e1e40ada Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 10 Dec 2016 16:12:48 -0500
 Subject: [PATCH] Improve the Saddle API for Horses

Spigot-API-Patches/0060-ensureServerConversions-API.patch

@@ -1,4 +1,4 @@
-From 4f36318d8921ffa44333a86eac125200caad51d5 Mon Sep 17 00:00:00 2001
+From 7a4550bdfee62eaba02e50fe3434310cb0b82f8c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 23:55:48 -0400
 Subject: [PATCH] ensureServerConversions API
@@ -28,10 +28,10 @@ index 762c43d6..045c26d9 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 73f79b22..14b6b6b3 100644
+index 3c91cbe6..4940e726 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -487,7 +487,12 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -495,7 +495,12 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
              }
          }
  
@@ -45,7 +45,7 @@ index 73f79b22..14b6b6b3 100644
      }
  
      /**
-@@ -545,4 +550,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -553,4 +558,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
  
          return true;
      }

Spigot-API-Patches/0061-Add-getI18NDisplayName-API.patch

@@ -1,4 +1,4 @@
-From c1dbeb3ae74907b1336b1d68f76279b883bb35e3 Mon Sep 17 00:00:00 2001
+From 75065c61ba95680cd9e1db23b402a094d141b616 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 23:55:48 -0400
 Subject: [PATCH] Add getI18NDisplayName API
@@ -28,10 +28,10 @@ index 045c26d9..47bbc0f9 100644
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 14b6b6b3..ca7a958f 100644
+index 4940e726..e52a39ec 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -563,5 +563,16 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -571,5 +571,16 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
      public ItemStack ensureServerConversions() {
          return Bukkit.getServer().getItemFactory().ensureServerConversions(this);
      }

Spigot-API-Patches/0062-ProfileWhitelistVerifyEvent.patch

@@ -1,4 +1,4 @@
-From 285c68e987f4db6db40f653a723754b5793dc6e8 Mon Sep 17 00:00:00 2001
+From a2f75206786a9be627fbdb0c6e1597b6a38db782 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 3 Jul 2017 18:11:34 -0500
 Subject: [PATCH] ProfileWhitelistVerifyEvent
@@ -9,10 +9,10 @@ Allows you to do dynamic whitelisting and change of kick message
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java
 new file mode 100644
-index 00000000..662e79e3
+index 00000000..a11f811e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java
-@@ -0,0 +1,120 @@
+@@ -0,0 +1,110 @@
 +/*
 + * Copyright (c) 2017 - Daniel Ennis (Aikar) - MIT License
 + *
@@ -39,7 +39,6 @@ index 00000000..662e79e3
 +package com.destroystokyo.paper.event.profile;
 +
 +import com.destroystokyo.paper.profile.PlayerProfile;
-+import com.mojang.authlib.GameProfile;
 +import org.bukkit.event.Event;
 +import org.bukkit.event.HandlerList;
 +
@@ -81,15 +80,6 @@ index 00000000..662e79e3
 +    }
 +
 +    /**
-+     * The gameprofile of the player trying to connect
-+     * @deprecated Will be removed in 1.13, use #{@link #getPlayerProfile()}
-+     */
-+    @Deprecated
-+    public GameProfile getProfile() {
-+        return profile.getGameProfile();
-+    }
-+
-+    /**
 +     * @return The profile of the player trying to connect
 +     */
 +    public PlayerProfile getPlayerProfile() {

Spigot-API-Patches/0063-Make-plugins-list-alphabetical.patch

@@ -1,4 +1,4 @@
-From 03867368971fb3bfad36b8ebe68d5948fd20ce0a Mon Sep 17 00:00:00 2001
+From 37638b5c57bc22517f707779b8c216d3cd24c131 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 02:08:55 -0500
 Subject: [PATCH] Make /plugins list alphabetical

Spigot-API-Patches/0064-LivingEntity-setKiller.patch

@@ -1,4 +1,4 @@
-From 054913afc1358179ae54b96956bce518334591ae Mon Sep 17 00:00:00 2001
+From bed7ac830a6ec1ab5b4b4e19a6c4abe47a2ba813 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:49:43 -0500
 Subject: [PATCH] LivingEntity#setKiller

Spigot-API-Patches/0065-Handle-plugin-prefixes-in-implementation-logging-con.patch

@@ -1,4 +1,4 @@
-From ffdbb97e00e44a8d86086aee473e45fa54e0b281 Mon Sep 17 00:00:00 2001
+From daf70a992ec9bf7b009aeda61cca417d7930e989 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:14:13 +0200
 Subject: [PATCH] Handle plugin prefixes in implementation logging

Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch

@@ -1,4 +1,4 @@
-From f9af8335c02b21624aeee8ac4cb1909d31bbff56 Mon Sep 17 00:00:00 2001
+From 1a487d66a8be68e6b9f90eec7cc97a56c465fb32 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:33:12 +0200
 Subject: [PATCH] Allow plugins to use SLF4J for logging
@@ -14,10 +14,10 @@ it without having to shade it in the plugin and going through
 several layers of logging abstraction.
 
 diff --git a/pom.xml b/pom.xml
-index 44a8b2a5..c176dd7b 100644
+index a58d4424..a771e156 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -121,6 +121,14 @@
+@@ -114,6 +114,14 @@
              <scope>compile</scope>
          </dependency>
  

Spigot-API-Patches/0067-Add-workaround-for-plugins-modifying-the-parent-of-t.patch

@@ -1,4 +1,4 @@
-From df23e00168bf3e3ff97132c082e03cc7c1728649 Mon Sep 17 00:00:00 2001
+From f0c22fcef9d528f8b773dbef3bb56968db826396 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 19:41:20 +0200
 Subject: [PATCH] Add workaround for plugins modifying the parent of the plugin

Spigot-API-Patches/0068-Add-PlayerJumpEvent.patch

@@ -1,4 +1,4 @@
-From 9f1f05d5857e0ce2cd806931ce4db9230c379989 Mon Sep 17 00:00:00 2001
+From 8e15888fcc667e68e2cb6f6d2b2febe36a7b3acd Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Sep 2017 17:21:32 -0400
 Subject: [PATCH] Add PlayerJumpEvent

Spigot-API-Patches/0069-Expose-client-protocol-version-and-virtual-host.patch

@@ -1,4 +1,4 @@
-From 4a4df5cf1adcaa8a25be2876c550c2ff2a517a67 Mon Sep 17 00:00:00 2001
+From 7505bac8503213c06c401a6196dd1c870060ae75 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 10 Oct 2017 18:44:42 +0200
 Subject: [PATCH] Expose client protocol version and virtual host

Spigot-API-Patches/0070-Add-PlayerArmorChangeEvent.patch

@@ -1,4 +1,4 @@
-From e7a01ce105a27097d7f08442b7db2aad136bcd7f Mon Sep 17 00:00:00 2001
+From 4ceb745753f3bb90b932daacc58c3fc104e8a795 Mon Sep 17 00:00:00 2001
 From: pkt77 <parkerkt77@gmail.com>
 Date: Fri, 10 Nov 2017 23:45:59 -0500
 Subject: [PATCH] Add PlayerArmorChangeEvent

Spigot-API-Patches/0071-API-to-get-a-BlockState-without-a-snapshot.patch

@@ -1,4 +1,4 @@
-From 1cb04b32f151759c17629a384fa8547a255334a6 Mon Sep 17 00:00:00 2001
+From 9833fee48ce1a110ee78003439deafc84f689c55 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 6 Nov 2017 21:10:01 -0500
 Subject: [PATCH] API to get a BlockState without a snapshot

Spigot-API-Patches/0072-AsyncTabCompleteEvent.patch

@@ -1,4 +1,4 @@
-From c98afebdb0e60908d750e33e33c06ad612ac6434 Mon Sep 17 00:00:00 2001
+From edc4698e52433d90bcaaf7007245e7acad4d52f1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Nov 2017 13:17:09 -0500
 Subject: [PATCH] AsyncTabCompleteEvent

Spigot-API-Patches/0073-Display-warning-on-deprecated-recipe-API.patch

@@ -1,4 +1,4 @@
-From 120a11417f9d48ca7ae42393b88e4751583391ef Mon Sep 17 00:00:00 2001
+From 4fc07207023b06376573d258a25b0fde0dae728e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 9 Dec 2017 12:40:25 -0500
 Subject: [PATCH] Display warning on deprecated recipe API

Spigot-API-Patches/0074-PlayerPickupExperienceEvent.patch

@@ -1,4 +1,4 @@
-From 7583b7eef0eb813aa2a79d214dea15eaab1b6dc7 Mon Sep 17 00:00:00 2001
+From 82123411c5381dec16732f3e729b996f3bfd6baa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:00:41 -0500
 Subject: [PATCH] PlayerPickupExperienceEvent

Spigot-API-Patches/0075-ExperienceOrbMergeEvent.patch

@@ -1,4 +1,4 @@
-From ac086d03f6617bcc272e6d9d7547ed7d1e94c808 Mon Sep 17 00:00:00 2001
+From 690ed111958090f2e13c9a53e6f3296820662330 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:56:24 -0500
 Subject: [PATCH] ExperienceOrbMergeEvent

Spigot-API-Patches/0076-Ability-to-apply-mending-to-XP-API.patch

@@ -1,4 +1,4 @@
-From a4490dff8b9cf87a9efbc8bbe807b629de2df02b Mon Sep 17 00:00:00 2001
+From 1dce855cf72b840b3c8ca68eef03f47850ea3169 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Dec 2017 17:38:07 -0500
 Subject: [PATCH] Ability to apply mending to XP API

Spigot-API-Patches/0077-PreCreatureSpawnEvent.patch

@@ -1,4 +1,4 @@
-From d96e899da4fd2b553148ba115ac5b68ee27952ad Mon Sep 17 00:00:00 2001
+From ed685ade98b7c91a16ea129ed517a8739cdb63d5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 16:59:43 -0500
 Subject: [PATCH] PreCreatureSpawnEvent

Spigot-API-Patches/0078-PlayerNaturallySpawnCreaturesEvent.patch

@@ -1,4 +1,4 @@
-From c5154039ff463f366dae9a072e0c014f92eabedb Mon Sep 17 00:00:00 2001
+From eda3592be1d17598e7261a86c55c4377289c2721 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:31:37 -0500
 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent

Spigot-API-Patches/0079-Add-SkullMeta.setPlayerProfile-API.patch

@@ -1,4 +1,4 @@
-From 956b151ae68497ff34ebf1f4dc540cc88754f276 Mon Sep 17 00:00:00 2001
+From 0a29a32a10268a1478ad045924aa706d7da5685a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 19 Jan 2018 00:29:28 -0500
 Subject: [PATCH] Add SkullMeta.setPlayerProfile API

Spigot-API-Patches/0080-Fill-Profile-Property-Events.patch

@@ -1,4 +1,4 @@
-From c3ae932f11c94cfa5b46fc5b11b04a283260708f Mon Sep 17 00:00:00 2001
+From d6ace9b5fd0e4dc637739347aefb6bcac808120c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 2 Jan 2018 00:31:08 -0500
 Subject: [PATCH] Fill Profile Property Events

Spigot-API-Patches/0081-PlayerAdvancementCriterionGrantEvent.patch

@@ -1,4 +1,4 @@
-From c74290391d661bac5694c965fdd19e56cb6c9e42 Mon Sep 17 00:00:00 2001
+From 37b0fe3449844988fdd20179130e820106c703c7 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Jan 2018 08:15:14 -0600
 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent

Spigot-API-Patches/0082-Add-ArmorStand-Item-Meta.patch

@@ -1,4 +1,4 @@
-From d49f8976711a2afe8d57cf0a546332f8c95df6ad Mon Sep 17 00:00:00 2001
+From c8dfb1c1ac5047c3989ed89c48a202c8e565f4d3 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 27 Jan 2018 17:06:24 -0500
 Subject: [PATCH] Add ArmorStand Item Meta

Spigot-API-Patches/0083-Optimize-Hoppers.patch

@@ -1,4 +1,4 @@
-From ad00ddb857bd631a9ae93eaabe76c044436f51d1 Mon Sep 17 00:00:00 2001
+From 6c67c5ba8e8ce89bfdd90a1d6264d14ba6a9037b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 18 Jan 2018 01:00:27 -0500
 Subject: [PATCH] Optimize Hoppers

Spigot-API-Patches/0084-Tameable-getOwnerUniqueId-API.patch

@@ -1,4 +1,4 @@
-From 49e9ab9b0b462f724ac9f77fbf6dd7c0c319225d Mon Sep 17 00:00:00 2001
+From ba8f331145982701fc0e9dc323c75e54fb5130d2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 24 Feb 2018 00:55:52 -0500
 Subject: [PATCH] Tameable#getOwnerUniqueId API

Spigot-API-Patches/0085-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch

@@ -1,4 +1,4 @@
-From 03d67fdc4e326c291edce8d26e66146c8d1dd111 Mon Sep 17 00:00:00 2001
+From 320c3d77f68b7b02d88d293898e91681cac3c90e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 11:43:30 -0400
 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent

Spigot-API-Patches/0086-Add-extended-PaperServerListPingEvent.patch

@@ -1,4 +1,4 @@
-From e983285e16c5833593ce8aaa6f806219cc08a641 Mon Sep 17 00:00:00 2001
+From 49a9d5dd768670e0cf6bb85313727ad57bc8428e Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 15:55:38 +0200
 Subject: [PATCH] Add extended PaperServerListPingEvent

Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch

@@ -1,4 +1,4 @@
-From f2bc9bc75a61d71a627a18f57f66a965ba99f1c3 Mon Sep 17 00:00:00 2001
+From c2dcfe42c36ad71eafe754ab961333e503857c34 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 12:28:55 -0400
 Subject: [PATCH] Player.setPlayerProfile API

Spigot-API-Patches/0088-getPlayerUniqueId-API.patch

@@ -1,4 +1,4 @@
-From 4f4d3dad507842141ff628337284fdd59deb9ab8 Mon Sep 17 00:00:00 2001
+From c4f01447191d4f50f00aa4e4975f70ddc174cf34 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 22 Mar 2018 01:39:28 -0400
 Subject: [PATCH] getPlayerUniqueId API
@@ -34,7 +34,7 @@ index 01a226d9..b389677a 100644
       * Gets the plugin manager for interfacing with plugins.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e7aab4bb..17ac4241 100644
+index 6c96fc14..f5aee1c5 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -356,6 +356,18 @@ public interface Server extends PluginMessageRecipient {

Spigot-API-Patches/0089-Add-legacy-ping-support-to-PaperServerListPingEvent.patch

@@ -1,4 +1,4 @@
-From 1a2033967ffb93634c6d4cd0af4e9d27d5d27b6e Mon Sep 17 00:00:00 2001
+From e730e57eded25def56fa85f4d51aa44cbcc5a135 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 19:30:20 +0200
 Subject: [PATCH] Add legacy ping support to PaperServerListPingEvent

Spigot-API-Patches/0090-Add-method-to-open-already-placed-sign.patch

@@ -1,4 +1,4 @@
-From 82828abda963ddcea2a0df4c15a8f0d3bb2f20c8 Mon Sep 17 00:00:00 2001
+From b8fbba03fc7abd8c77f063e41fc16537c4117102 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 1 Apr 2018 02:28:43 +0300
 Subject: [PATCH] Add method to open already placed sign

Spigot-API-Patches/0091-Add-version-history-to-version-command.patch

@@ -1,4 +1,4 @@
-From f4043d993253dd4c573166dd6cc91347bf85bbcf Mon Sep 17 00:00:00 2001
+From ec7ab0fda0b8db766c75b88b151228cd8a7f99e6 Mon Sep 17 00:00:00 2001
 From: Kyle Wood <demonwav@gmail.com>
 Date: Thu, 1 Mar 2018 19:37:52 -0600
 Subject: [PATCH] Add version history to version command

Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch

@@ -1,4 +1,4 @@
-From 6514d05e7994ca64d84829f5ea5f08881d896143 Mon Sep 17 00:00:00 2001
+From 4b6fe9261d73d066a8b0a10b1205c3a8db3f4e25 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Apr 2018 10:28:50 -0400
 Subject: [PATCH] Add Ban Methods to Player Objects

Spigot-API-Patches/0093-EndermanEscapeEvent.patch

@@ -1,4 +1,4 @@
-From f6de564e86fa93c0f80a7f13fea4c725fde220a7 Mon Sep 17 00:00:00 2001
+From e6e2f854d47264daa82dac76e0e9b50e1d048112 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:14:30 -0400
 Subject: [PATCH] EndermanEscapeEvent

Spigot-API-Patches/0094-Enderman.teleportRandomly.patch

@@ -1,4 +1,4 @@
-From 1ec75ba436761bb918589563fcd3b71d19846ce0 Mon Sep 17 00:00:00 2001
+From d39ff6984ee7da570e62149453cc739c70608e7d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:29:15 -0400
 Subject: [PATCH] Enderman.teleportRandomly()

Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch

@@ -1,4 +1,4 @@
-From 684b4b13045cf9a8ed1c8246539feb43afd55cee Mon Sep 17 00:00:00 2001
+From abf7402bc4ecece3ae26cdc95077e1948f349189 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 17:55:28 -0400
 Subject: [PATCH] Additional world.getNearbyEntities API's

Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch

@@ -1,4 +1,4 @@
-From 5d998b54fbc373ae8d50dd5c19ddb64cd5db3e2c Mon Sep 17 00:00:00 2001
+From d6390344700e8736df3210e7fe2b54d942dd0b3f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 19:27:31 -0400
 Subject: [PATCH] Location.isChunkLoaded() API

Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch

@@ -1,4 +1,4 @@
-From 16fae4609fea741833ed1b7936b260fc18628cee Mon Sep 17 00:00:00 2001
+From 8c9cae0f00a34d7db7987f0de3e348143fca2559 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 29 Aug 2017 23:58:48 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder

Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch

@@ -1,4 +1,4 @@
-From 6c6a2ce230f36f7b42b89b2ba7be407dc28c3a3c Mon Sep 17 00:00:00 2001
+From 859fbcc49fee34e570ef93b1cedeea6129c923d7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 20:17:44 -0400
 Subject: [PATCH] EndermanAttackPlayerEvent

Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch

@@ -1,4 +1,4 @@
-From 7fde4c2352b99a7f57694bdae89f691ecc656c68 Mon Sep 17 00:00:00 2001
+From 9e6d679a2e1a3956d445cf4a45b317dafd5ab8b0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 21:33:35 -0400
 Subject: [PATCH] Close Plugin Class Loaders on Disable

Spigot-API-Patches/0100-WitchConsumePotionEvent.patch

@@ -1,4 +1,4 @@
-From aad0ca777756d4b341f053bd70ffce06d04b3206 Mon Sep 17 00:00:00 2001
+From 4c4ed4d357e2ee60585351f515c1e2ef82754042 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:26:16 -0400
 Subject: [PATCH] WitchConsumePotionEvent

Spigot-API-Patches/0101-WitchThrowPotionEvent.patch

@@ -1,4 +1,4 @@
-From 541ae193668500d017ebe33cda73a44121ee3455 Mon Sep 17 00:00:00 2001
+From ec8448715301fcfc22907e25053ce24046112ec7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:39:09 -0400
 Subject: [PATCH] WitchThrowPotionEvent

Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch

@@ -1,4 +1,4 @@
-From a6bcc9478c95e056ec412ed1317f4d597b0a7017 Mon Sep 17 00:00:00 2001
+From 6b5682f52304efe35982bf2d15e3d9a25b840b66 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 24 May 2018 21:01:13 -0400
 Subject: [PATCH] Location.toBlockLocation/toCenterLocation()