NOT FINISHED!!! Current Progress on 1.13-pre7 update

This work is 100% unfinished. I am pushing it up so that we as a team
can work on this update.

Do not try to use this branch. You will fail.

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

@@ -1,14 +1,14 @@
-From 19a0ed42ec75273fa4ccab45bb726f5d1a90c4c2 Mon Sep 17 00:00:00 2001
+From 7439e7e3c94eb559415193440a9e1515335819c7 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 99ff13b3..cc8fca48 100644
+index 3e6c8707..c2d0651e 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -3,13 +3,19 @@
+@@ -3,29 +3,35 @@
           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>
  
@@ -20,9 +20,8 @@ index 99ff13b3..cc8fca48 100644
 +        <version>dev-SNAPSHOT</version>
 +    </parent>
 +
-+    <groupId>com.destroystokyo.paper</groupId>
 +    <artifactId>paper-api</artifactId>
-     <version>1.13-pre5-R0.1-SNAPSHOT</version>
+     <version>1.13-pre7-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Spigot-API</name>
@@ -32,7 +31,13 @@ index 99ff13b3..cc8fca48 100644
      <description>An enhanced plugin API for Minecraft servers.</description>
  
      <properties>
-@@ -20,12 +26,12 @@
+-        <maven.compiler.source>1.7</maven.compiler.source>
+-        <maven.compiler.target>1.7</maven.compiler.target>
++        <!-- Paper - #Logic -->
++        <maven.compiler.source>1.8</maven.compiler.source>
++        <maven.compiler.target>1.8</maven.compiler.target>
+         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+     </properties>
  
      <distributionManagement>
          <repository>
@@ -111,7 +116,7 @@ index 99ff13b3..cc8fca48 100644
 -                    <plugin>
 -                        <groupId>org.codehaus.mojo</groupId>
 -                        <artifactId>animal-sniffer-maven-plugin</artifactId>
--                        <version>1.16</version>
+-                        <version>1.17</version>
 -                        <executions>
 -                            <execution>
 -                                <phase>process-classes</phase>
@@ -123,7 +128,7 @@ index 99ff13b3..cc8fca48 100644
 -                        <configuration>
 -                            <signature>
 -                                <groupId>org.codehaus.mojo.signature</groupId>
--                                <artifactId>java18</artifactId>
+-                                <artifactId>java17</artifactId>
 -                                <version>1.0</version>
 -                            </signature>
 -                        </configuration>

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

@@ -1,4 +1,4 @@
-From 53fb6f06b531517937c55be04dc33916403c6c5c Mon Sep 17 00:00:00 2001
+From 0845d92e6aa2ddf0d67519da4af0713f77e9eed0 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
@@ -3529,10 +3529,10 @@ index bba914d7..00000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 86eca9e1..116a1e7a 100644
+index 115c5b0b..90b22bcc 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1541,6 +1541,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1535,6 +1535,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
@@ -3602,7 +3602,7 @@ index 8b130abb..80c152ba 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 80c6a72e..759c4617 100644
+index 113b899c..81b42822 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -40,7 +40,6 @@ import org.bukkit.plugin.PluginLoader;
@@ -3621,7 +3621,7 @@ index 80c6a72e..759c4617 100644
  
      /**
       * This class was not meant to be constructed explicitly
-@@ -289,26 +287,20 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -291,26 +289,20 @@ public final class JavaPluginLoader implements PluginLoader {
                  }
              }
  

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

@@ -1,4 +1,4 @@
-From 2964c90dcc4e0304b7c77475523c9a7eab2ea98b Mon Sep 17 00:00:00 2001
+From 6930a5ac9c5a9fba958a9d72769f6be40c406fd0 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 0b5c062f..48d6c951 100644
+index 9d34e691..b0b1defc 100644
 --- a/src/main/java/org/bukkit/entity/FallingBlock.java
 +++ b/src/main/java/org/bukkit/entity/FallingBlock.java
-@@ -50,4 +50,15 @@ public interface FallingBlock extends Entity {
+@@ -52,4 +52,15 @@ public interface FallingBlock extends Entity {
       * @param hurtEntities whether entities will be damaged by this block.
       */
      void setHurtEntities(boolean hurtEntities);

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

@@ -1,14 +1,14 @@
-From 90e6868ac669e61bc3b0e176b452181dcf078c2c Mon Sep 17 00:00:00 2001
+From a550e7f0f5f00bea6d9b453614818877a470ebb6 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
 
 
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 759c461..d8b9c24 100644
+index 81b42822..3af99b5b 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-@@ -329,6 +329,10 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -331,6 +331,10 @@ public final class JavaPluginLoader implements PluginLoader {
                  jPlugin.setEnabled(true);
              } catch (Throwable ex) {
                  server.getLogger().log(Level.SEVERE, "Error occurred while enabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
@@ -20,5 +20,5 @@ index 759c461..d8b9c24 100644
  
              // Perhaps abort here, rather than continue going, but as it stands,
 -- 
-2.10.0.windows.1
+2.18.0
 

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

@@ -1,14 +1,14 @@
-From 983f39e99a72d696cce6d90cd3688cbffbf5bf22 Mon Sep 17 00:00:00 2001
+From 627bc079ead8a9849e8b0046a4045aa8ff3a69f8 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
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 5a30fa93..be51e389 100644
+index 97c2172b..f6ae0a6d 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -360,4 +360,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
+@@ -376,4 +376,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
       * @return collision status
       */
      boolean isCollidable();
@@ -29,5 +29,5 @@ index 5a30fa93..be51e389 100644
 +    // Paper end
  }
 -- 
-2.13.3.windows.1
+2.18.0
 

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

@@ -1,11 +1,11 @@
-From 38ccae5eed9ac184d71461d0b9fce2b7659bb80e Mon Sep 17 00:00:00 2001
+From 25ab827755fbe15e9f3c4165140a16be9689ed81 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
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 5955b20c..f1876a05 100644
+index 1837a14c..5638a077 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1206,7 +1206,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -77,30 +77,34 @@ index 5955b20c..f1876a05 100644
      public class Spigot extends Entity.Spigot
      {
 diff --git a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
-index 4c498016..4c838519 100644
+index 4c498016..aa18a766 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
-@@ -10,13 +10,28 @@ import org.bukkit.event.HandlerList;
+@@ -10,13 +10,32 @@ import org.bukkit.event.HandlerList;
  public class PlayerResourcePackStatusEvent extends PlayerEvent {
  
      private static final HandlerList handlers = new HandlerList();
++    @Deprecated
 +    private final String hash; // Paper
      private final Status status;
  
-+    @Deprecated // Paper
      public PlayerResourcePackStatusEvent(final Player who, Status resourcePackStatus) {
          super(who);
 +        this.hash = null; // Paper
          this.status = resourcePackStatus;
      }
  
-+    // Paper start
++    @Deprecated // Paper
 +    public PlayerResourcePackStatusEvent(final Player who, Status resourcePackStatus, String hash) {
 +        super(who);
 +        this.hash = hash; // Paper
 +        this.status = resourcePackStatus;
 +    }
 +
++    @Deprecated
++    /**
++     * @deprecated Hash does not seem to ever be set
++     */
 +    public String getHash() {
 +        return this.hash;
 +    }

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

@@ -1,4 +1,4 @@
-From e3d8a0f30c3e83f2308268ca6221478f46a82008 Mon Sep 17 00:00:00 2001
+From 39bd1036ea8a04cd417c8bab59421ef5e7ba6e0c 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 f5e8d49d..dfc6c9b5 100644
+index 5e2024ca..bd9146dd 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -127,6 +127,17 @@
@@ -401,10 +401,10 @@ index 3b2c99ea..b45b6c1c 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index d8b9c244..40fd71dc 100644
+index 3af99b5b..72d506d1 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-@@ -287,20 +287,7 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -289,20 +289,7 @@ public final class JavaPluginLoader implements PluginLoader {
                  }
              }
  

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

@@ -1,11 +1,11 @@
-From e859235a5d23ac1232b75122a23aa4dc605a3d1c Mon Sep 17 00:00:00 2001
+From 08d440055e45edea4106415945fcfe5b7c3d1318 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
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f1876a05..d06f26b9 100644
+index 5638a077..bc2f9621 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -394,6 +394,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -47,7 +47,7 @@ index f1876a05..d06f26b9 100644
      public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
          spigot().sendMessage(position, components);
      }
-@@ -1749,9 +1771,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1743,9 +1765,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          /**
           * Sends the component to the specified screen position of this player
           *
@@ -59,7 +59,7 @@ index f1876a05..d06f26b9 100644
          public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent component) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -1759,9 +1783,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1753,9 +1777,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          /**
           * Sends an array of components as a single message to the specified screen position of this player
           *

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

@@ -1,4 +1,4 @@
-From 569e6283060854cef2140d7a3ad0b2690911215b Mon Sep 17 00:00:00 2001
+From bc65fcc9a464b4c8d7b28758d6fad8d98eefa05d 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,10 +6,10 @@ 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 19632d17..de1b1112 100644
+index 1ed8f7e4..bd5238ce 100644
 --- a/src/main/java/org/bukkit/NamespacedKey.java
 +++ b/src/main/java/org/bukkit/NamespacedKey.java
-@@ -27,8 +27,8 @@ public final class NamespacedKey {
+@@ -38,8 +38,8 @@ public final class NamespacedKey {
      /**
       * Create a key in a specific namespace.
       *
@@ -21,10 +21,10 @@ index 19632d17..de1b1112 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 65156e80..6417cefa 100644
+index 1e980d2d..4cc70326 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1365,6 +1365,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1376,6 +1376,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -32,7 +32,7 @@ index 65156e80..6417cefa 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, T data);
  
-@@ -1380,6 +1381,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1391,6 +1392,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -40,7 +40,7 @@ index 65156e80..6417cefa 100644
       */
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, T data);
  
-@@ -1429,6 +1431,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1440,6 +1442,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -48,7 +48,7 @@ index 65156e80..6417cefa 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, T data);
  
-@@ -1448,6 +1451,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1459,6 +1462,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -56,7 +56,7 @@ index 65156e80..6417cefa 100644
       */
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data);
  
-@@ -1503,6 +1507,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1514,6 +1518,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -64,7 +64,7 @@ index 65156e80..6417cefa 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
  
-@@ -1524,6 +1529,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1535,6 +1540,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -112,7 +112,7 @@ index cfce8fa5..8660070b 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d06f26b9..5c29c11e 100644
+index bc2f9621..47a12d71 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -409,7 +409,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline

Spigot-API-Patches/0061-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch

@@ -1,47 +0,0 @@
-From 3fe26d396837d1f3aad927133722332e4d1f7b51 Mon Sep 17 00:00:00 2001
-From: willies952002 <admin@domnian.com>
-Date: Thu, 20 Jul 2017 18:05:36 -0400
-Subject: [PATCH] Allow Changing of Player Sample in ServerListPingEvent
-
-
-diff --git a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
-index 3c38d857..cb8d0fcd 100644
---- a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
-+++ b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
-@@ -2,6 +2,7 @@ package org.bukkit.event.server;
- 
- import java.net.InetAddress;
- import java.util.Iterator;
-+import java.util.List;
- 
- import org.apache.commons.lang.Validate;
- import org.bukkit.entity.Player;
-@@ -145,4 +146,25 @@ public class ServerListPingEvent extends ServerEvent implements Iterable<Player>
-     public Iterator<Player> iterator() throws UnsupportedOperationException {
-         throw new UnsupportedOperationException();
-     }
-+
-+    // Paper start
-+    private java.util.List<String> sample;
-+
-+    /**
-+     * @deprecated Will be replaced in 1.13
-+     */
-+    @Deprecated
-+    public void setSampleText(java.util.List<String> sample) {
-+        this.sample = sample;
-+    }
-+
-+    /**
-+     * @deprecated Will be replaced in 1.13
-+     */
-+    @Deprecated
-+    public java.util.List<String> getSampleText() {
-+        return sample;
-+    }
-+    // Paper end
-+
- }
--- 
-2.15.1
-

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

@@ -1,4 +1,4 @@
-From 5b40b7e3f882c44f18249d89dbbeb93298af3535 Mon Sep 17 00:00:00 2001
+From d64ec328014274efa75dfacaf6b37cb11f642f69 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
@@ -78,5 +78,5 @@ index 00000000..7944f26a
 +
 +public interface SaddledHorseInventory extends AbstractHorseInventory {}
 -- 
-2.16.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From 575bbab52d06b324acd9b8758d454d74a859c8d0 Mon Sep 17 00:00:00 2001
+From ac29eaf3c0dc567bfbe8e20a323cdfaefd6242b8 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
@@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr
 to ensure it meets latest minecraft expectations.
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index f74f8ae9..ab33e09e 100644
+index 762c43d6..045c26d9 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -134,4 +134,16 @@ public interface ItemFactory {

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

@@ -1,4 +1,4 @@
-From 83009175cba71dcdd63ac621aeb5453073fe2c7f Mon Sep 17 00:00:00 2001
+From b2d5adef80eed3964ab16df2c98789763d150fd7 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
@@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this,
 You must replace the language file embedded in the server jar.
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index ab33e09e..061954f9 100644
+index 045c26d9..47bbc0f9 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -145,5 +145,15 @@ public interface ItemFactory {

Spigot-API-Patches/0064-ProfileWhitelistVerifyEvent.patch

@@ -1,4 +1,4 @@
-From 69a0afed643918933b0ad8f6d81780dafa33cf6b Mon Sep 17 00:00:00 2001
+From 1dfa87d569f72303f04c3a29130145c91f25f506 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 3 Jul 2017 18:11:34 -0500
 Subject: [PATCH] ProfileWhitelistVerifyEvent
@@ -134,5 +134,5 @@ index 00000000..662e79e3
 +    }
 +}
 -- 
-2.15.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From 665b880ec9616fbc2aea0aee0d2d2dbf2a3613e8 Mon Sep 17 00:00:00 2001
+From 86390176ccf85c98f464e5ff6bb90f27952ae60a 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
@@ -50,5 +50,5 @@ index e40b03a7..b1d384e8 100644
      }
  }
 -- 
-2.15.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From ac9baf5c2739f255205d959cc519be2db01773da Mon Sep 17 00:00:00 2001
+From 7963cbbdb5c04bb9f749576c89573aaf1c2279bb 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/0067-Handle-plugin-prefixes-in-implementation-logging-con.patch

@@ -1,4 +1,4 @@
-From f27a613d49050d6941376ec69d0efa182cab743c Mon Sep 17 00:00:00 2001
+From 99c169a9b437e6bd0088d70cb74c81a221808521 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
@@ -40,5 +40,5 @@ index 16b1eb37..0abad9ad 100644
  
      /**
 -- 
-2.15.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From 8ae719b2fa6b1e3a270d8cdc7ecea48d8137f2a4 Mon Sep 17 00:00:00 2001
+From 78649d9322cf676aeca08d8f43053600d34a619d 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,7 +14,7 @@ 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 e1a39bfe..db9a57b0 100644
+index 44a8b2a5..c176dd7b 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -121,6 +121,14 @@

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

@@ -1,4 +1,4 @@
-From 4c8bb1fd1597ec5da47cec0832b705ee68572209 Mon Sep 17 00:00:00 2001
+From 0f5f1f61e5e6128993289722564719846613ed1b 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/0070-Add-PlayerJumpEvent.patch

@@ -1,4 +1,4 @@
-From 01c9b5fa055b84a9b62c60cc067cbe2cdd35d18f Mon Sep 17 00:00:00 2001
+From cb37a11f62d5ad49044c57e9364911f5914708d9 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
@@ -112,5 +112,5 @@ index 00000000..dd24f9b0
 +    }
 +}
 -- 
-2.15.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From d40adbcb5398dc21486b6b6c8817d751fe9ced12 Mon Sep 17 00:00:00 2001
+From e3792c13f6e712593072cb31dc951110ff1e6632 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
@@ -55,7 +55,7 @@ index 00000000..9072e384
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 5c29c11e..60cdd620 100644
+index 47a12d71..362467e5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -31,7 +31,7 @@ import org.bukkit.scoreboard.Scoreboard;

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

@@ -1,4 +1,4 @@
-From 62575a75cec03d048cabfce9933dc35c93532832 Mon Sep 17 00:00:00 2001
+From a19dc4df4d2e6230616f78cc0eec847092cded18 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/0073-API-to-get-a-BlockState-without-a-snapshot.patch

@@ -1,4 +1,4 @@
-From e0beaa49adfc67cd4d5144e22f2c3e3c20f13b3b Mon Sep 17 00:00:00 2001
+From 5b78e31d0aeb0cfcf2d3e108326c660d3cfd7aa1 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
@@ -9,7 +9,7 @@ on the real tile entity.
 This is useful for where performance is needed
 
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index bda9900e..d5d0e255 100644
+index 1aa3373f..9aab043c 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -242,6 +242,15 @@ public interface Block extends Metadatable {

Spigot-API-Patches/0074-AsyncTabCompleteEvent.patch

@@ -1,4 +1,4 @@
-From ce5e52c29872bfca3e47d91777b075db4ce21d20 Mon Sep 17 00:00:00 2001
+From 2fe82eb2c39bc39aa0264a02db45e8bf643d1d26 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Nov 2017 13:17:09 -0500
 Subject: [PATCH] AsyncTabCompleteEvent
@@ -247,5 +247,5 @@ index 6ac437d5..df6eb53d 100644
  
      @Override
 -- 
-2.15.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From 252d7dcf7c5531b482ea92f756a6847d9b26ad84 Mon Sep 17 00:00:00 2001
+From 92fba1efc29b3550577a18bcf74cb41327f59019 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
@@ -34,5 +34,5 @@ index ca5c09b8..f2dd46f2 100644
      }
  
 -- 
-2.15.1
+2.18.0
 

Spigot-API-Patches/0076-PlayerPickupExperienceEvent.patch

@@ -1,4 +1,4 @@
-From 1dcc1f273169ef66f371e8d44ae5133bc314b7df Mon Sep 17 00:00:00 2001
+From 6acec34388a520536f958b9c92c632892c2cef27 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:00:41 -0500
 Subject: [PATCH] PlayerPickupExperienceEvent
@@ -88,5 +88,5 @@ index 00000000..f9ef95cd
 +    }
 +}
 -- 
-2.17.1
+2.18.0
 

Spigot-API-Patches/0077-ExperienceOrbMergeEvent.patch

@@ -1,4 +1,4 @@
-From 796e5d95f60258b2f2c2e8d665f09c5d01fb9823 Mon Sep 17 00:00:00 2001
+From 51c1f56626683e98d9c9728d6ebc399e0123a91b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:56:24 -0500
 Subject: [PATCH] ExperienceOrbMergeEvent
@@ -96,5 +96,5 @@ index 00000000..fb5b4b86
 +    }
 +}
 -- 
-2.17.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From 3fda9a76e026397bae881455bd5ec05d774be252 Mon Sep 17 00:00:00 2001
+From 468f4768ac979bb546fe16cc286ed533ac26e04e 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
@@ -10,7 +10,7 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 60cdd620..32ead009 100644
+index 362467e5..6709168b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -916,12 +916,33 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline

Spigot-API-Patches/0079-PreCreatureSpawnEvent.patch

@@ -1,4 +1,4 @@
-From 3c047d4917be9616b971aa725a2682d45f814b6d Mon Sep 17 00:00:00 2001
+From 4171ce67cc2901442e728da492533f9fec795711 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 16:59:43 -0500
 Subject: [PATCH] PreCreatureSpawnEvent
@@ -119,5 +119,5 @@ index 00000000..bac1cef3
 +    }
 +}
 -- 
-2.17.1
+2.18.0
 

Spigot-API-Patches/0080-PlayerNaturallySpawnCreaturesEvent.patch

@@ -1,4 +1,4 @@
-From 54bc8edf2d329bbfeb5e48fda52d44bf6fe8a47e Mon Sep 17 00:00:00 2001
+From ce4a90e4f24108e85f7c66050711c1b5667085bb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:31:37 -0500
 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent
@@ -76,5 +76,5 @@ index 00000000..7c6953a7
 +    }
 +}
 -- 
-2.17.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From 96d8312552c442c8489d6dbb914f0623ad74b66b Mon Sep 17 00:00:00 2001
+From fd43f9fb69c2e0792c33ee16e007134728a3df2d 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
@@ -7,22 +7,21 @@ This allows you to create already filled textures on Skulls to avoid texture loo
 which commonly cause rate limit issues with Mojang API
 
 diff --git a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
-index c60860e1..3eea5909 100644
+index 15c1dfd9..a458000f 100644
 --- a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
-@@ -1,8 +1,11 @@
+@@ -1,7 +1,10 @@
  package org.bukkit.inventory.meta;
  
 +import com.destroystokyo.paper.profile.PlayerProfile;
- import org.bukkit.Material;
++import javax.annotation.Nullable;
  import org.bukkit.OfflinePlayer;
  
-+import javax.annotation.Nullable;
 +
  /**
-  * Represents a skull ({@link Material#SKULL_ITEM}) that can have an owner.
+  * Represents a skull that can have an owner.
   */
-@@ -37,6 +40,20 @@ public interface SkullMeta extends ItemMeta {
+@@ -36,6 +39,20 @@ public interface SkullMeta extends ItemMeta {
      @Deprecated
      boolean setOwner(String owner);
  
@@ -44,5 +43,5 @@ index c60860e1..3eea5909 100644
       * Gets the owner of the skull.
       *
 -- 
-2.17.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From 6411e77da00dacbe848850db4660c86130fda955 Mon Sep 17 00:00:00 2001
+From f932e1e9c552db09887c010fbb179ddf05d4a416 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
@@ -169,5 +169,5 @@ index 00000000..aba0c087
 +    }
 +}
 -- 
-2.17.1
+2.18.0
 

Spigot-API-Patches/0083-PlayerAdvancementCriterionGrantEvent.patch

@@ -1,4 +1,4 @@
-From afa05f7fef0d3337d684319325143b4d441cea16 Mon Sep 17 00:00:00 2001
+From b19e61438f5405ee5e004322bed0fea411f18924 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
@@ -69,5 +69,5 @@ index 00000000..b65ee9e5
 +    }
 +}
 -- 
-2.17.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From f8f9ee57846ba4838769c0eb20ef870dc14cb793 Mon Sep 17 00:00:00 2001
+From 68d7994d386398bd6ad0a51efbb58f1d1357ba0d 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
@@ -95,5 +95,5 @@ index 00000000..7e4acfff
 +    void setMarker(boolean marker);
 +}
 -- 
-2.17.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From cd7a3c2d083750dfd3c520841072a4b7ed8c469b Mon Sep 17 00:00:00 2001
+From 3d903c7ed998ce99c37f5b392021b982b9283955 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
@@ -38,5 +38,5 @@ index 06ec99ae..b44cc45b 100644
      }
  
 -- 
-2.17.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From 3ff6fc393591f3a29c98ae084e1c67be2eacdee6 Mon Sep 17 00:00:00 2001
+From bc63e16534cb5f723604669f5acb8b70ad600eab 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
@@ -33,5 +33,5 @@ index 44497aa3..0987c1e8 100644
       */
      public AnimalTamer getOwner();
 -- 
-2.17.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From 41c7e4edd8c9d6e23f7a546ccee245eea652f073 Mon Sep 17 00:00:00 2001
+From c438100df0d0e3f2210c8a932e596c0dd327ca29 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
@@ -51,5 +51,5 @@ index 1d571889..0c16128e 100644
          this.message = "";
          this.name = name;
 -- 
-2.17.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From d2e267fceb2a1990a2a95c57fd50e653212e5260 Mon Sep 17 00:00:00 2001
+From cbeaccc81b0cf819614ee7f57c7ec2f63aa3477f 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
@@ -366,5 +366,5 @@ index 04804706..44563482 100644
 +    // Paper end
  }
 -- 
-2.17.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From 8ccc5f587f1e755b7136c87160b2134637905d98 Mon Sep 17 00:00:00 2001
+From dff56416f41aa3ed9bfe8eb38174279b2c189ac4 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 32ead009..cd82ff64 100644
+index 6709168b..99080b27 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3,6 +3,7 @@ package org.bukkit.entity;

Spigot-API-Patches/0090-Implement-deprecated-player-sample-API.patch

@@ -1,77 +0,0 @@
-From d35e326f5e55fa14cdf9b1eacba970704ddcc16e Mon Sep 17 00:00:00 2001
-From: Minecrell <minecrell@minecrell.net>
-Date: Mon, 27 Nov 2017 16:21:19 +0100
-Subject: [PATCH] Implement deprecated player sample API
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java
-index dd1deafd..db992df2 100644
---- a/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java
-+++ b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java
-@@ -4,6 +4,7 @@ import static java.util.Objects.requireNonNull;
- 
- import com.destroystokyo.paper.network.StatusClient;
- import com.destroystokyo.paper.profile.PlayerProfile;
-+import com.google.common.base.Strings;
- import org.bukkit.Bukkit;
- import org.bukkit.entity.Player;
- import org.bukkit.event.Cancellable;
-@@ -316,4 +317,25 @@ public class PaperServerListPingEvent extends ServerListPingEvent implements Can
-         }
-     }
- 
-+    // TODO: Remove in 1.13
-+
-+    @Override
-+    @Deprecated
-+    public List<String> getSampleText() {
-+        List<String> sampleText = new ArrayList<>();
-+        for (PlayerProfile profile : getPlayerSample()) {
-+            sampleText.add(Strings.nullToEmpty(profile.getName()));
-+        }
-+        return sampleText;
-+    }
-+
-+    @Override
-+    @Deprecated
-+    public void setSampleText(List<String> sample) {
-+        getPlayerSample().clear();
-+        for (String name : sample) {
-+            getPlayerSample().add(Bukkit.createProfile(name));
-+        }
-+    }
-+
- }
-diff --git a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
-index cb8d0fcd..116d7c7a 100644
---- a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
-+++ b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
-@@ -4,6 +4,7 @@ import java.net.InetAddress;
- import java.util.Iterator;
- import java.util.List;
- 
-+import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
- import org.apache.commons.lang.Validate;
- import org.bukkit.entity.Player;
- import org.bukkit.event.HandlerList;
-@@ -151,7 +152,7 @@ public class ServerListPingEvent extends ServerEvent implements Iterable<Player>
-     private java.util.List<String> sample;
- 
-     /**
--     * @deprecated Will be replaced in 1.13
-+     * @deprecated Will be removed in 1.13, use {@link PaperServerListPingEvent#getPlayerSample()}
-      */
-     @Deprecated
-     public void setSampleText(java.util.List<String> sample) {
-@@ -159,7 +160,7 @@ public class ServerListPingEvent extends ServerEvent implements Iterable<Player>
-     }
- 
-     /**
--     * @deprecated Will be replaced in 1.13
-+     * @deprecated Will be removed in 1.13, use {@link PaperServerListPingEvent#getPlayerSample()}
-      */
-     @Deprecated
-     public java.util.List<String> getSampleText() {
--- 
-2.17.1
-

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

@@ -1,4 +1,4 @@
-From 154ed7732b789705984e91d137eb41bd27e6857e Mon Sep 17 00:00:00 2001
+From 9a6d0e5ca85f0cc9a82b7eaa2dc4435cffc6c3d7 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

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

@@ -1,4 +1,4 @@
-From b37f3ff8e0ccb80a8f8b5931561cb6b022ac4f41 Mon Sep 17 00:00:00 2001
+From 9889b9a859949be8666d55e15aeff843c5a80d2b 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
@@ -29,5 +29,5 @@ index 517d1523..ffda9f6a 100644
 +
  }
 -- 
-2.17.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From 184976102b7c58792c87b7092f76f9ed9a4c5d4e Mon Sep 17 00:00:00 2001
+From c8afd6a6b8a7485805ed3eab9cd3b5faf59f6b28 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
@@ -23,5 +23,5 @@ index 3939d4af..dd95773e 100644
 +    // Paper end
  }
 -- 
-2.17.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From 2b7db879b8f87e7539717559348c34dfcee58f70 Mon Sep 17 00:00:00 2001
+From df28e17f5f2d148f78f8ae0c03a3a7b51da7b081 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
@@ -197,5 +197,5 @@ index 044361af..c45faf4c 100644
          PluginDescriptionFile desc = plugin.getDescription();
          sender.sendMessage(ChatColor.GREEN + desc.getName() + ChatColor.WHITE + " version " + ChatColor.GREEN + desc.getVersion());
 -- 
-2.17.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From 68981606bad552b49cd120b84b751263dd27c5dc Mon Sep 17 00:00:00 2001
+From 78be1ecf7b7a0c39cef11e710ab52f7257805913 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
@@ -69,7 +69,7 @@ index 3ab2e4c7..8daf2ddc 100644
      /**
       * Checks if this player is whitelisted or not
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index cd82ff64..2dd9ecfb 100644
+index 99080b27..59c6a097 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1,10 +1,14 @@

Spigot-API-Patches/0095-EndermanEscapeEvent.patch

@@ -1,4 +1,4 @@
-From 83671e59f09544a3abe88beef5ed74eb454489f9 Mon Sep 17 00:00:00 2001
+From a76bc604a4fc380fd9fbadf1c30959c6724bc8e0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:14:30 -0400
 Subject: [PATCH] EndermanEscapeEvent
@@ -96,5 +96,5 @@ index 00000000..0d15a8ab
 +    }
 +}
 -- 
-2.17.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From 285b525bcd3fb261160e811c4174086878e58d58 Mon Sep 17 00:00:00 2001
+From ae31d989fe8cdbe48cb5f36db3e9fd7e1a913a97 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()
@@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly()
 Ability to trigger the vanilla "teleport randomly" mechanic of an enderman.
 
 diff --git a/src/main/java/org/bukkit/entity/Enderman.java b/src/main/java/org/bukkit/entity/Enderman.java
-index c8b4efde..bc2df752 100644
+index ab827f83..459ec0c9 100644
 --- a/src/main/java/org/bukkit/entity/Enderman.java
 +++ b/src/main/java/org/bukkit/entity/Enderman.java
 @@ -8,6 +8,17 @@ import org.bukkit.material.MaterialData;
@@ -25,7 +25,7 @@ index c8b4efde..bc2df752 100644
 +    // Paper end
 +
      /**
-      * Get the id and data of the block that the Enderman is carrying.
+      * Gets the id and data of the block that the Enderman is carrying.
       *
 -- 
 2.18.0

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

@@ -1,4 +1,4 @@
-From b2de08cdbc2ad955bf2f000aa9377b6c23d82b8b Mon Sep 17 00:00:00 2001
+From 5dbaacdda092901a3fbc3dc89d42fa53f9869cfe 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's
 Provides more methods to get nearby entities, and filter by types and predicates
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 6417cefa..9b49ed38 100644
+index 4cc70326..97badc63 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -2,11 +2,14 @@ package org.bukkit;
@@ -24,7 +24,7 @@ index 6417cefa..9b49ed38 100644
  
  import org.bukkit.block.Biome;
  import org.bukkit.block.Block;
-@@ -492,6 +495,205 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -503,6 +506,205 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public Collection<Entity> getEntitiesByClasses(Class<?>... classes);
  

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

@@ -1,4 +1,4 @@
-From fab29e96a141caa798cc94404c6625cee93401c8 Mon Sep 17 00:00:00 2001
+From 35e2de767d021fbac9df464ada1422955342bfd6 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
@@ -17,5 +17,5 @@ index 5c3d42cc..1ddebf3c 100644
      public boolean equals(Object obj) {
          if (obj == null) {
 -- 
-2.17.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From 571654be037ad2ec4d0457f75787e01209855415 Mon Sep 17 00:00:00 2001
+From c6a4a37ea77dbc070c7c5297f41a2331a519968a 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
@@ -410,10 +410,10 @@ index 4d0acaf5..0ae85d85 100644
       * Options which can be applied to redstone dust particles - a particle
       * color and size.
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 9b49ed38..cc74cf53 100644
+index 97badc63..a22e47ea 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1733,7 +1733,31 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1744,7 +1744,31 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *             the type of this depends on {@link Particle#getDataType()}
       * @param <T> Type
       */

Spigot-API-Patches/0100-EndermanAttackPlayerEvent.patch

@@ -1,4 +1,4 @@
-From e92bcc778ef8292d527034e43d8621ce6759eb4c Mon Sep 17 00:00:00 2001
+From 954a377e0960f18820e9ef8a3098d5f0358a284d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 20:17:44 -0400
 Subject: [PATCH] EndermanAttackPlayerEvent
@@ -106,5 +106,5 @@ index 00000000..55912659
 +    }
 +}
 -- 
-2.17.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From 13d2ed50d6346f5c8eb7833dd99f7c61e8fd0b29 Mon Sep 17 00:00:00 2001
+From 9e505b4488cc6cb5a94d213092c949a2895c7cad 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
@@ -100,10 +100,10 @@ index bd0588a2..cb2b0b9c 100644
              lookupNames.clear();
              HandlerList.unregisterAll();
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 40fd71dc..3e87c3dd 100644
+index 72d506d1..3cff01b6 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-@@ -317,7 +317,7 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -319,7 +319,7 @@ public final class JavaPluginLoader implements PluginLoader {
              } catch (Throwable ex) {
                  server.getLogger().log(Level.SEVERE, "Error occurred while enabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
                  // Paper start - Disable plugins that fail to load
@@ -112,7 +112,7 @@ index 40fd71dc..3e87c3dd 100644
                  return;
                  // Paper end
              }
-@@ -328,7 +328,13 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -330,7 +330,13 @@ public final class JavaPluginLoader implements PluginLoader {
          }
      }
  
@@ -126,7 +126,7 @@ index 40fd71dc..3e87c3dd 100644
          Validate.isTrue(plugin instanceof JavaPlugin, "Plugin is not associated with this PluginLoader");
  
          if (plugin.isEnabled()) {
-@@ -355,6 +361,16 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -357,6 +363,16 @@ public final class JavaPluginLoader implements PluginLoader {
                  for (String name : names) {
                      removeClass(name);
                  }
@@ -144,5 +144,5 @@ index 40fd71dc..3e87c3dd 100644
          }
      }
 -- 
-2.17.1
+2.18.0
 

Spigot-API-Patches/0102-WitchConsumePotionEvent.patch

@@ -1,4 +1,4 @@
-From 7afba907835ff028bc6df4bbc8a61c721913e328 Mon Sep 17 00:00:00 2001
+From be2efe30ca0ea347d901f873e416d2e9b4973156 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:26:16 -0400
 Subject: [PATCH] WitchConsumePotionEvent
@@ -115,5 +115,5 @@ index 00000000..6ef6367b
 +    }
 +}
 -- 
-2.17.1
+2.18.0
 

Spigot-API-Patches/0103-WitchThrowPotionEvent.patch

@@ -1,4 +1,4 @@
-From 56bcd520031264156557ee37406ad31801e4615e Mon Sep 17 00:00:00 2001
+From 4b9da1b2e0d668e73dba9a673984af7d0be648cd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:39:09 -0400
 Subject: [PATCH] WitchThrowPotionEvent
@@ -79,5 +79,5 @@ index 6ef6367b..77487e28 100644
  
      @Override
 -- 
-2.17.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From b3a03a0fef09bf81b68cda7d9bbeca9fbe0620f8 Mon Sep 17 00:00:00 2001
+From fedd7fd91d2e697183c38f16f58ba29791a4ab28 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()
@@ -40,5 +40,5 @@ index 1ddebf3c..916238c4 100644
      public boolean equals(Object obj) {
          if (obj == null) {
 -- 
-2.17.1
+2.18.0
 

Spigot-API-Patches/0105-PotionEffect-clone-methods.patch

@@ -1,4 +1,4 @@
-From 65451a70d7b009c6be27094e4bce37b1fa9e0055 Mon Sep 17 00:00:00 2001
+From c6aee3dcccadea3bd3d205b5a57976282695ffd6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Jun 2018 04:10:13 -0400
 Subject: [PATCH] PotionEffect clone methods
@@ -40,5 +40,5 @@ index e7b86f85..53fb428f 100644
          int type = getInt(map, TYPE);
          PotionEffectType effect = PotionEffectType.getById(type);
 -- 
-2.17.1
+2.18.0
 

Spigot-API-Patches/0106-WitchReadyPotionEvent.patch

@@ -1,4 +1,4 @@
-From 2f1e07e1372f23f43228dfa883f7c68b3693efc0 Mon Sep 17 00:00:00 2001
+From 22191113338e641960b5fa666940463514f187cb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 22:47:08 -0400
 Subject: [PATCH] WitchReadyPotionEvent
@@ -83,5 +83,5 @@ index 00000000..5082662a
 +    }
 +}
 -- 
-2.17.1
+2.18.0
 

Spigot-API-Patches/0107-ItemStack-getMaxItemUseDuration.patch

@@ -1,4 +1,4 @@
-From bcf7365a6ac997f6b7e3276a64c010a244d5d642 Mon Sep 17 00:00:00 2001
+From a51daa61f1e96d6ddce2e5a205da53be66293ba2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 22:59:50 -0400
 Subject: [PATCH] ItemStack#getMaxItemUseDuration

Spigot-API-Patches/0108-Add-EntityTeleportEndGatewayEvent.patch

@@ -1,4 +1,4 @@
-From 68c89dbfd099490e99b0c394d263cb6f7ca05c7e Mon Sep 17 00:00:00 2001
+From 15c16def63477471b46d0e8620061f60a87afb9e Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 9 Jun 2018 13:08:21 +0100
 Subject: [PATCH] Add EntityTeleportEndGatewayEvent
@@ -40,5 +40,5 @@ index 00000000..80899ecb
 +
 +}
 -- 
-2.17.1
+2.18.0
 

Spigot-API-Patches/0109-Add-SentientNPC-Interface-to-Entities.patch

@@ -1,4 +1,4 @@
-From 80cc0c18e993c665f6aaf581b65e6c627a4a5805 Mon Sep 17 00:00:00 2001
+From 3945a9c95cb03bb2b784ca479a563e7c58dcfeb8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 16 Jun 2018 13:41:00 -0400
 Subject: [PATCH] Add SentientNPC Interface to Entities
@@ -152,17 +152,6 @@ index 0d87d203..d4eee19c 100644
  
      /**
       * @return The size of the slime
-diff --git a/src/main/java/org/bukkit/entity/WaterMob.java b/src/main/java/org/bukkit/entity/WaterMob.java
-index 3e89ca0c..8d105e72 100644
---- a/src/main/java/org/bukkit/entity/WaterMob.java
-+++ b/src/main/java/org/bukkit/entity/WaterMob.java
-@@ -3,4 +3,5 @@ package org.bukkit.entity;
- /**
-  * Represents a Water Mob
-  */
--public interface WaterMob extends LivingEntity {}
-+public interface WaterMob extends LivingEntity, com.destroystokyo.paper.entity.SentientNPC { // Paper
-+}
 -- 
 2.18.0
 

Spigot-API-Patches/0110-Make-shield-blocking-delay-configurable.patch

@@ -1,14 +1,14 @@
-From cfe3f366cacec9477b3f69fdf9da3e70c11d1b09 Mon Sep 17 00:00:00 2001
+From 118e1b69d8392749b045d2022d9acc9ccef3de5e Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 16 Jun 2018 01:17:39 -0500
 Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 42cf95e1..5921c952 100644
+index 700ed29f..7ea7ccf0 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -385,5 +385,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
+@@ -401,5 +401,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
       * @param arrows Number of arrows to stick in this entity
       */
      void setArrowsStuck(int arrows);
@@ -29,5 +29,5 @@ index 42cf95e1..5921c952 100644
      // Paper end
  }
 -- 
-2.17.1
+2.18.0
 

Spigot-API-Patches/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch

@@ -1,4 +1,4 @@
-From 700930b99045dbef4f1c65e7edda7d67edb3680c Mon Sep 17 00:00:00 2001
+From c80d0e0381e3d1b215422e47bb2d3006a14eaf92 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 15 Jun 2013 19:52:04 -0400
 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
@@ -39,5 +39,5 @@ index f8c91a13..c9eb75aa 100644
          this.projectile = projectile;
          this.force = force;
 -- 
-2.17.1
+2.18.0
 

Spigot-API-Patches/0112-Add-getNearbyXXX-methods-to-Location.patch

@@ -1,4 +1,4 @@
-From 8dae21e28f695e73fa04d18e1bdc00d2436cbf22 Mon Sep 17 00:00:00 2001
+From a709f75d9481442be8e2c93a1aea4d952ae0ea0b Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 18 Jun 2018 00:41:46 -0500
 Subject: [PATCH] Add "getNearbyXXX" methods to Location
@@ -220,5 +220,5 @@ index 916238c4..c1689168 100644
      @Override
      public boolean equals(Object obj) {
 -- 
-2.17.1
+2.18.0
 

Spigot-API-Patches/0113-PlayerReadyArrowEvent.patch

@@ -1,4 +1,4 @@
-From 464e3985e5e2c29198f15414c94c9abb75d8aed3 Mon Sep 17 00:00:00 2001
+From 92facfd2330948fd4cce26393a114a210833044c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 01:09:27 -0400
 Subject: [PATCH] PlayerReadyArrowEvent
@@ -101,5 +101,5 @@ index 00000000..c6add1b1
 +    }
 +}
 -- 
-2.17.1
+2.18.0
 

Spigot-API-Patches/0114-Add-EntityKnockbackByEntityEvent.patch

@@ -1,4 +1,4 @@
-From ec1d10299d09e368cbafa5917ea3f34d11ad6ef5 Mon Sep 17 00:00:00 2001
+From 09c65738e9deb67f2f09af03f8fdf7e55030239a Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Mon, 18 Jun 2018 15:40:39 +0200
 Subject: [PATCH] Add EntityKnockbackByEntityEvent
@@ -78,5 +78,5 @@ index 00000000..99f7ef70
 +    }
 +}
 -- 
-2.16.1.windows.1
+2.18.0
 

Spigot-API-Patches/0115-Expand-Explosions-API.patch

@@ -1,4 +1,4 @@
-From 8e19f89eca90b5ea616a877f3a0d9c2379a42bda Mon Sep 17 00:00:00 2001
+From fecce987f570eaaf23ffd3482a77dd263e98060f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:24:42 -0500
 Subject: [PATCH] Expand Explosions API
@@ -95,10 +95,10 @@ index c1689168..d0d86e1a 100644
      @Override
      public boolean equals(Object obj) {
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index cc74cf53..2c1056d1 100644
+index a22e47ea..04c174f7 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -914,6 +914,99 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -925,6 +925,99 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public boolean createExplosion(Location loc, float power, boolean setFire);
  

Spigot-API-Patches/0116-ItemStack-API-additions-for-quantity-flags-lore.patch

@@ -1,4 +1,4 @@
-From 4de5eaeaa68379e316e7c851d6e6e66f2ccdd996 Mon Sep 17 00:00:00 2001
+From 88883a05c172e4fcf52f583bee5640675156df5b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 22 Jun 2018 22:59:18 -0400
 Subject: [PATCH] ItemStack API additions for quantity/flags/lore

Spigot-API-Patches/0117-LivingEntity-Hand-Raised-Item-Use-API.patch

@@ -1,4 +1,4 @@
-From d76f522b7f164a56a7f9651170e439739ef6e015 Mon Sep 17 00:00:00 2001
+From b438ad8c47194fc97e310672e407a79feeee73dd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:19:19 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 5921c952..5ccb8ef3 100644
+index 7ea7ccf0..fea831e6 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -10,6 +10,7 @@ import org.bukkit.Material;
@@ -17,7 +17,7 @@ index 5921c952..5ccb8ef3 100644
  import org.bukkit.potion.PotionEffect;
  import org.bukkit.potion.PotionEffectType;
  import org.bukkit.projectiles.ProjectileSource;
-@@ -399,5 +400,27 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
+@@ -415,5 +416,27 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
       * @param delay Delay in ticks
       */
      void setShieldBlockingDelay(int delay);

Spigot-API-Patches/0118-RangedEntity-API.patch

@@ -1,4 +1,4 @@
-From d2a1657e1c25dc241d143ee6486513c024a5695b Mon Sep 17 00:00:00 2001
+From c803b354f0aafbc01e813d8c2c1dae0c933251ba Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 26 Jun 2018 21:34:40 -0400
 Subject: [PATCH] RangedEntity API

Spigot-API-Patches/0119-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch

@@ -1,4 +1,4 @@
-From 664f399ae92f6c74e4dd132d24c7abe3181c9fc6 Mon Sep 17 00:00:00 2001
+From 24a9e71e950ac0ff3a753f35aed71fa638f71290 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sat, 30 Jun 2018 05:45:04 +0200
 Subject: [PATCH] Improve ProjectileHitEvent to include the BlockFace where the
@@ -53,5 +53,5 @@ index 35f4148b..db105e76 100644
       * Gets the entity that was hit, if it was an entity that was hit.
       *
 -- 
-2.16.1.windows.1
+2.18.0
 

Spigot-API-Patches/0120-Add-World.getEntity-UUID-API.patch

@@ -1,14 +1,14 @@
-From 0db5338a2f3a427e6341c3e7bef58f9ec644a1e7 Mon Sep 17 00:00:00 2001
+From e4c6eec43f3bdf6061fd52063aeb259f0de63da2 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 3 Jul 2018 16:07:16 +0200
 Subject: [PATCH] Add World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 2c1056d1..c98349cc 100644
+index 04c174f7..121033e9 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -714,6 +714,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -725,6 +725,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public Collection<Entity> getNearbyEntities(Location location, double x, double y, double z);
  

Spigot-API-Patches/0121-InventoryCloseEvent-Reason-API.patch

@@ -1,4 +1,4 @@
-From eeec38e29cc2041734e18b87f80400f63fa7734c Mon Sep 17 00:00:00 2001
+From 97af6ce4d4a8a8b3fdf945fb6c9b7e474def6c4c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 3 Jul 2018 21:52:52 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API

Spigot-API-Patches/0122-Entity-getChunk-API.patch

@@ -1,4 +1,4 @@
-From 99dd52878fbaede269af3c5cf38c179688506099 Mon Sep 17 00:00:00 2001
+From 094ab21aca5c9ccbd61e95bf8f247a7f51526c03 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 02:25:48 -0400
 Subject: [PATCH] Entity#getChunk API

Spigot-API-Patches/0123-Vex-getOwner-API.patch

@@ -1,4 +1,4 @@
-From 02a5c50ac1f88560d7555bc299b4d785f9aa63a4 Mon Sep 17 00:00:00 2001
+From b906caf7828cd434767fed31635d853b077d7d09 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 15:29:21 -0400
 Subject: [PATCH] Vex#getOwner API