Update upstream B/CB/S

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

@@ -1,14 +1,14 @@
-From afc54113a05902a020f9d36d62e7de74fce3f3b2 Mon Sep 17 00:00:00 2001
+From b6b21b6bdacb1ea6abdd132e3f173822ef543836 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
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 0263e9cc..a2714118 100644
+index 4f5eb367..d793de62 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -546,4 +546,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -557,4 +557,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
      @Override
      Spigot spigot();
      // Spigot end
@@ -65,5 +65,5 @@ index fcd0a9b2..2abef57c 100644
 +    }
  }
 -- 
-2.19.0
+2.19.1
 

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

@@ -1,14 +1,14 @@
-From 02510a57a8684efe916a9af81a503ffb5d67cf69 Mon Sep 17 00:00:00 2001
+From 94390b309f18a31512191e9599c08a2cdf746191 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 6a5de671d..b4f519c68 100644
+index ed1d5064..ed6463c6 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -383,4 +383,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
+@@ -454,4 +454,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
       * @return collision status
       */
      boolean isCollidable();
@@ -29,5 +29,5 @@ index 6a5de671d..b4f519c68 100644
 +    // Paper end
  }
 -- 
-2.18.0
+2.19.1
 

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

@@ -1,4 +1,4 @@
-From 9e7f9915a3c7e0c57d407ff884ef4262aea8568b Mon Sep 17 00:00:00 2001
+From 5a4ad7c25a554997a5d590629a529cd35f099366 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
@@ -7,10 +7,10 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 91ad39a8..7875a71a 100644
+index 94647047..06bcee03 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -25,6 +25,33 @@ import org.bukkit.util.Vector;
+@@ -28,6 +28,33 @@ import org.bukkit.util.Vector;
   */
  public interface World extends PluginMessageRecipient, Metadatable {
  
@@ -45,5 +45,5 @@ index 91ad39a8..7875a71a 100644
       * Gets the {@link Block} at the given coordinates
       *
 -- 
-2.18.0
+2.19.1
 

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

@@ -1,4 +1,4 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From ed11ef22d0208c77b50c740e7fd69c217d3688ba 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 7ac07ac07ac0..7ac07ac07ac0 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 {
@@ -21,10 +21,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 06bcee03..849ad2cb 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1350,6 +1350,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1567,6 +1567,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 7ac07ac07ac0..7ac07ac07ac0 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, T data);
  
-@@ -1365,6 +1366,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1582,6 +1583,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 7ac07ac07ac0..7ac07ac07ac0 100644
       */
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, T data);
  
-@@ -1414,6 +1416,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1631,6 +1633,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 7ac07ac07ac0..7ac07ac07ac0 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, T data);
  
-@@ -1433,6 +1436,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1650,6 +1653,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 7ac07ac07ac0..7ac07ac07ac0 100644
       */
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data);
  
-@@ -1488,6 +1492,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1705,6 +1709,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 7ac07ac07ac0..7ac07ac07ac0 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
  
-@@ -1509,6 +1514,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1726,6 +1731,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()}
@@ -72,7 +72,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
       */
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
  
-@@ -1531,6 +1537,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1748,6 +1754,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param force whether to send the particle to players within an extended
       *              range and encourage their client to render it regardless of
       *              settings
@@ -80,7 +80,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force);
  
-@@ -1555,6 +1562,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1772,6 +1779,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param force whether to send the particle to players within an extended
       *              range and encourage their client to render it regardless of
       *              settings
@@ -89,7 +89,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force);
  
 diff --git a/src/main/java/org/bukkit/entity/AbstractHorse.java b/src/main/java/org/bukkit/entity/AbstractHorse.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 10757454..6d5410ea 100644
 --- a/src/main/java/org/bukkit/entity/AbstractHorse.java
 +++ b/src/main/java/org/bukkit/entity/AbstractHorse.java
 @@ -22,7 +22,7 @@ public interface AbstractHorse extends Animals, Vehicle, InventoryHolder, Tameab
@@ -102,7 +102,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/entity/AreaEffectCloud.java b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 9a569d3a..8c5efd17 100644
 --- a/src/main/java/org/bukkit/entity/AreaEffectCloud.java
 +++ b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
 @@ -138,6 +138,7 @@ public interface AreaEffectCloud extends Entity {
@@ -114,7 +114,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
      <T> void setParticle(Particle particle, T data);
  
 diff --git a/src/main/java/org/bukkit/entity/Guardian.java b/src/main/java/org/bukkit/entity/Guardian.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 98af0563..ec6890ae 100644
 --- a/src/main/java/org/bukkit/entity/Guardian.java
 +++ b/src/main/java/org/bukkit/entity/Guardian.java
 @@ -12,7 +12,7 @@ public interface Guardian extends Monster {
@@ -127,7 +127,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/entity/Horse.java b/src/main/java/org/bukkit/entity/Horse.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index cfce8fa5..8660070b 100644
 --- a/src/main/java/org/bukkit/entity/Horse.java
 +++ b/src/main/java/org/bukkit/entity/Horse.java
 @@ -151,7 +151,7 @@ public interface Horse extends AbstractHorse {
@@ -140,7 +140,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 99353714..e848ab5b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -446,7 +446,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -233,7 +233,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
  
 diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 2a02ab85..e33d00b3 100644
 --- a/src/main/java/org/bukkit/entity/Skeleton.java
 +++ b/src/main/java/org/bukkit/entity/Skeleton.java
 @@ -15,6 +15,7 @@ public interface Skeleton extends Monster {
@@ -245,7 +245,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index cf53ea22..62923379 100644
 --- a/src/main/java/org/bukkit/entity/Zombie.java
 +++ b/src/main/java/org/bukkit/entity/Zombie.java
 @@ -29,14 +29,14 @@ public interface Zombie extends Monster {
@@ -266,7 +266,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index de4fb37f..f1de2af6 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
 @@ -24,6 +24,7 @@ public class PlayerLoginEvent extends PlayerEvent {
@@ -286,7 +286,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
      public PlayerLoginEvent(final Player player, String hostname, final InetAddress address, final Result result, final String message, final InetAddress realAddress) { // Spigot
          this(player, hostname, address, realAddress); // Spigot
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 762c43d6..ec2b8b8e 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -126,10 +126,10 @@ public interface ItemFactory {
@@ -304,7 +304,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/inventory/Merchant.java b/src/main/java/org/bukkit/inventory/Merchant.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index c8e68570..45431b36 100644
 --- a/src/main/java/org/bukkit/inventory/Merchant.java
 +++ b/src/main/java/org/bukkit/inventory/Merchant.java
 @@ -32,7 +32,7 @@ public interface Merchant {
@@ -326,7 +326,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
      void setRecipe(int i, MerchantRecipe recipe) throws IndexOutOfBoundsException;
  
 diff --git a/src/main/java/org/bukkit/potion/Potion.java b/src/main/java/org/bukkit/potion/Potion.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 1413b361..b4a8051c 100644
 --- a/src/main/java/org/bukkit/potion/Potion.java
 +++ b/src/main/java/org/bukkit/potion/Potion.java
 @@ -78,6 +78,7 @@ public class Potion {
@@ -338,7 +338,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/potion/PotionBrewer.java b/src/main/java/org/bukkit/potion/PotionBrewer.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 40f8d12b..33d19228 100644
 --- a/src/main/java/org/bukkit/potion/PotionBrewer.java
 +++ b/src/main/java/org/bukkit/potion/PotionBrewer.java
 @@ -34,6 +34,8 @@ public interface PotionBrewer {
@@ -351,7 +351,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
       */
      public Collection<PotionEffect> getEffects(PotionType type, boolean upgraded, boolean extended);
 diff --git a/src/main/java/org/bukkit/potion/PotionType.java b/src/main/java/org/bukkit/potion/PotionType.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 034421a7..f1a54c23 100644
 --- a/src/main/java/org/bukkit/potion/PotionType.java
 +++ b/src/main/java/org/bukkit/potion/PotionType.java
 @@ -68,6 +68,7 @@ public enum PotionType {
@@ -381,7 +381,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index ab71f3c3..358ea386 100644
 --- a/src/main/java/org/bukkit/scoreboard/Team.java
 +++ b/src/main/java/org/bukkit/scoreboard/Team.java
 @@ -84,7 +84,7 @@ public interface Team {

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

@@ -1,14 +1,14 @@
-From 573401ed73ea3117352b8c823b91e807052363c3 Mon Sep 17 00:00:00 2001
+From 863ed563e69f6e02d31354d301825cfc27f89b58 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()
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index a2714118..6bdbd7ab 100644
+index d793de62..08399637 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -556,5 +556,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -567,5 +567,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
       * @return Location where entity originates or null if not yet added
       */
      Location getOrigin();
@@ -22,5 +22,5 @@ index a2714118..6bdbd7ab 100644
      // Paper end
  }
 -- 
-2.19.0
+2.19.1
 

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

@@ -1,23 +1,23 @@
-From bed7ac830a6ec1ab5b4b4e19a6c4abe47a2ba813 Mon Sep 17 00:00:00 2001
+From 9c0208e3612a2a5a623ace987c4e420f500e2bd1 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
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index f6ae0a6d..700ed29f 100644
+index ed6463c6..7770da71 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -14,6 +14,8 @@ import org.bukkit.potion.PotionEffect;
- import org.bukkit.potion.PotionEffectType;
- import org.bukkit.projectiles.ProjectileSource;
+@@ -18,6 +18,8 @@ import org.bukkit.projectiles.ProjectileSource;
+ import org.bukkit.util.RayTraceResult;
+ import org.bukkit.util.Vector;
  
 +import javax.annotation.Nullable;
 +
  /**
   * Represents a living entity, such as a monster or player
   */
-@@ -169,6 +171,15 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
+@@ -240,6 +242,15 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
       */
      public Player getKiller();
  
@@ -34,5 +34,5 @@ index f6ae0a6d..700ed29f 100644
       * Adds the given {@link PotionEffect} to the living entity.
       * <p>
 -- 
-2.18.0
+2.19.1
 

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

@@ -1,4 +1,4 @@
-From 9833fee48ce1a110ee78003439deafc84f689c55 Mon Sep 17 00:00:00 2001
+From fcc3fbaed0fd4baeab9f53a7c9ac847cddfb0a0f 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,10 +9,10 @@ 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 679c29cf..238de6f0 100644
+index 24100a6a..d71815d1 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
-@@ -223,6 +223,15 @@ public interface Block extends Metadatable {
+@@ -226,6 +226,15 @@ public interface Block extends Metadatable {
       */
      BlockState getState();
  
@@ -29,5 +29,5 @@ index 679c29cf..238de6f0 100644
       * Returns the biome that this block resides in
       *
 -- 
-2.18.0
+2.19.1
 

Spigot-API-Patches/0079-Add-setPlayerProfile-API-for-Skulls.patch

@@ -1,4 +1,4 @@
-From 55e3e61db93e7dba8a19a6f2094fccf3b2fcab2f Mon Sep 17 00:00:00 2001
+From 5dbcfd053603e67423074aaa91dd327e6dca7a60 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 19 Jan 2018 00:29:28 -0500
 Subject: [PATCH] Add setPlayerProfile API for Skulls
@@ -7,7 +7,7 @@ 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/block/Skull.java b/src/main/java/org/bukkit/block/Skull.java
-index 92363d33..b83df2f7 100644
+index 499a153e..3c75341e 100644
 --- a/src/main/java/org/bukkit/block/Skull.java
 +++ b/src/main/java/org/bukkit/block/Skull.java
 @@ -4,6 +4,8 @@ import org.bukkit.Material;
@@ -38,8 +38,8 @@ index 92363d33..b83df2f7 100644
 +    // Paper end
 +
      /**
-      * Gets the rotation of the skull in the world
-      *
+      * Gets the rotation of the skull in the world (or facing direction if this
+      * is a wall mounted skull).
 diff --git a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
 index 15c1dfd9..a458000f 100644
 --- a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
@@ -77,5 +77,5 @@ index 15c1dfd9..a458000f 100644
       * Gets the owner of the skull.
       *
 -- 
-2.16.1.windows.1
+2.19.1
 

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

@@ -1,4 +1,4 @@
-From 3503f246b1f30c2609671fdc92b80b62e981d7db Mon Sep 17 00:00:00 2001
+From 0ccef7fd8a50d98175e9cac5f171ee4d12d037f3 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,10 +6,10 @@ 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 bf6f91917..9ce6d7d57 100644
+index 849ad2cb..99fbf327 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2,11 +2,14 @@ package org.bukkit;
+@@ -2,6 +2,8 @@ package org.bukkit;
  
  import java.io.File;
  import org.bukkit.generator.ChunkGenerator;
@@ -18,13 +18,7 @@ index bf6f91917..9ce6d7d57 100644
  import java.util.Collection;
  import java.util.HashMap;
  import java.util.List;
- import java.util.Map;
- import java.util.UUID;
-+import java.util.function.Predicate;
- 
- import org.bukkit.block.Biome;
- import org.bukkit.block.Block;
-@@ -444,6 +447,238 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -447,6 +449,238 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public Collection<Entity> getEntitiesByClasses(Class<?>... classes);
  
@@ -264,5 +258,5 @@ index bf6f91917..9ce6d7d57 100644
       * Get a list of all players in this World
       *
 -- 
-2.19.0
+2.19.1
 

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

@@ -1,4 +1,4 @@
-From ce6f1473f564bc740f9438a4c45876bdff15d691 Mon Sep 17 00:00:00 2001
+From 43beb0d7397bc0067f08e4ec41ddfb4d46145f7d 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
@@ -10,7 +10,7 @@ This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/com/destroystokyo/paper/ParticleBuilder.java b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
 new file mode 100644
-index 000000000..50b52d6bf
+index 00000000..50b52d6b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
 @@ -0,0 +1,416 @@
@@ -431,7 +431,7 @@ index 000000000..50b52d6bf
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
-index 4d0acaf5b..827aa00c8 100644
+index 4d0acaf5..827aa00c 100644
 --- a/src/main/java/org/bukkit/Particle.java
 +++ b/src/main/java/org/bukkit/Particle.java
 @@ -82,6 +82,16 @@ public enum Particle {
@@ -452,10 +452,10 @@ index 4d0acaf5b..827aa00c8 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 9ce6d7d57..d20b940ac 100644
+index 99fbf327..1f63eba8 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1751,7 +1751,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1967,7 +1967,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *             the type of this depends on {@link Particle#getDataType()}
       * @param <T> Type
       */
@@ -515,5 +515,5 @@ index 9ce6d7d57..d20b940ac 100644
      /**
       * Spawns the particle (the number of times specified by count)
 -- 
-2.19.0
+2.19.1
 

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

@@ -1,14 +1,14 @@
-From 30af6dcd81dc8b15be9306fe0bc16f3fe39203f7 Mon Sep 17 00:00:00 2001
+From bffcdf28d7682a5c6c9094d680b691a7d8d71656 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 d699a8e18..dfb3f484f 100644
+index 7770da71..3191aeca 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -408,5 +408,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
+@@ -479,5 +479,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 d699a8e18..dfb3f484f 100644
      // Paper end
  }
 -- 
-2.18.0
+2.19.1
 

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

@@ -1,4 +1,4 @@
-From ef5875eebd65341d8a1651738ca82c417bf6a3eb Mon Sep 17 00:00:00 2001
+From 73be070d77dd79f210bf045c6ec01bf2ecf72f18 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API
 Add Entity as a Source capability, and add more API choices, and on Location.
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 162a76e8b..056a4d6bb 100644
+index 162a76e8..056a4d6b 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
 @@ -745,6 +745,87 @@ public class Location implements Cloneable, ConfigurationSerializable {
@@ -98,10 +98,10 @@ index 162a76e8b..056a4d6bb 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 d20b940ac..673f1a3eb 100644
+index 1f63eba8..e83b2ac7 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -899,6 +899,102 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1115,6 +1115,102 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public boolean createExplosion(Location loc, float power, boolean setFire);
  
@@ -205,5 +205,5 @@ index d20b940ac..673f1a3eb 100644
       * Gets the {@link Environment} type of this world
       *
 -- 
-2.19.0
+2.19.1
 

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

@@ -1,4 +1,4 @@
-From 8ec6c2fa48cbf638a5d27edb47d12c1442d24992 Mon Sep 17 00:00:00 2001
+From fcf363977c7c1a57154fbfe638aa85f6480329ba 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,10 +6,10 @@ 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 dfb3f484f..ac5bd8a57 100644
+index 3191aeca..f4f60de2 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;
+@@ -12,6 +12,7 @@ import org.bukkit.World;
  import org.bukkit.attribute.Attributable;
  import org.bukkit.block.Block;
  import org.bukkit.inventory.EntityEquipment;
@@ -17,7 +17,7 @@ index dfb3f484f..ac5bd8a57 100644
  import org.bukkit.potion.PotionEffect;
  import org.bukkit.potion.PotionEffectType;
  import org.bukkit.projectiles.ProjectileSource;
-@@ -422,5 +423,31 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
+@@ -493,5 +494,31 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
       * @param delay Delay in ticks
       */
      void setShieldBlockingDelay(int delay);
@@ -50,5 +50,5 @@ index dfb3f484f..ac5bd8a57 100644
      // Paper end
  }
 -- 
-2.18.0
+2.19.1
 

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

@@ -1,14 +1,14 @@
-From 9068935d9c8fc8d37ca47ceeef6e752c5ef84ecf Mon Sep 17 00:00:00 2001
+From 596f70a064c3481f5197b4b17cd4126e9dd8799a 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 673f1a3eb..51cf0bfe8 100644
+index e83b2ac7..7c700cc2 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -699,6 +699,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -705,6 +705,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public Collection<Entity> getNearbyEntities(Location location, double x, double y, double z);
  
@@ -23,8 +23,8 @@ index 673f1a3eb..51cf0bfe8 100644
 +    // Paper end
 +
      /**
-      * Gets the unique name of this world
-      *
+      * Returns a list of entities within a bounding box centered around a
+      * Location.
 -- 
-2.19.0
+2.19.1
 

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

@@ -1,4 +1,4 @@
-From 2cb5b1bda018ce49ec34c527b63a8848990a01ea Mon Sep 17 00:00:00 2001
+From aa7fb497e60582cd247d5e3a6b36816f1b2e4a87 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API
 Get the chunk the entity is currently registered to
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 6bdbd7ab..66904a0c 100644
+index 08399637..f94160bf 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -1,5 +1,6 @@
@@ -16,7 +16,7 @@ index 6bdbd7ab..66904a0c 100644
  import org.bukkit.Location;
  import org.bukkit.EntityEffect;
  import org.bukkit.Nameable;
-@@ -563,5 +564,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -574,5 +575,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
       * @return True if entity spawned from a mob spawner
       */
      boolean fromMobSpawner();
@@ -30,5 +30,5 @@ index 6bdbd7ab..66904a0c 100644
      // Paper end
  }
 -- 
-2.19.0
+2.19.1
 

Spigot-API-Patches/0134-Provide-Chunk-Coordinates-as-a-Long-API.patch

@@ -1,4 +1,4 @@
-From 9ec35d157059d4ecbd252758b13ffd7954976cbd Mon Sep 17 00:00:00 2001
+From e1702becffffcfef95443310f01d1b93dcd5e38f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 4 Aug 2018 19:37:35 -0400
 Subject: [PATCH] Provide Chunk Coordinates as a Long API
@@ -7,7 +7,7 @@ Allows you to easily access the chunks X/z as a long, and a method
 to look up by the long key too.
 
 diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index 079b9febe..b347a3ccf 100644
+index 079b9feb..b347a3cc 100644
 --- a/src/main/java/org/bukkit/Chunk.java
 +++ b/src/main/java/org/bukkit/Chunk.java
 @@ -23,6 +23,32 @@ public interface Chunk {
@@ -44,10 +44,10 @@ index 079b9febe..b347a3ccf 100644
       * Gets the world containing this chunk
       *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 5e6cb56ab..e451ca611 100644
+index 7c700cc2..00d72565 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -137,6 +137,21 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -139,6 +139,21 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public Chunk getChunkAt(Block block);
  
@@ -70,5 +70,5 @@ index 5e6cb56ab..e451ca611 100644
       * Checks if the specified {@link Chunk} is loaded
       *
 -- 
-2.19.0
+2.19.1
 

Spigot-API-Patches/0135-Async-Chunks-API.patch

@@ -1,4 +1,4 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From bad3fe871eeaf7fe3ce39307f84193c264c833cb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 17:43:33 -0600
 Subject: [PATCH] Async Chunks API
@@ -8,10 +8,10 @@ Adds API's to load or generate chunks asynchronously.
 Also adds utility methods to Entity to teleport asynchronously.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 00d72565..8e322cab 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -150,6 +150,352 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -152,6 +152,352 @@ public interface World extends PluginMessageRecipient, Metadatable {
      public default Chunk getChunkAt(long chunkKey) {
          return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
      }
@@ -365,10 +365,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index f94160bf..5ee57656 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -124,6 +124,28 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -135,6 +135,28 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
       */
      public boolean teleport(Entity destination, TeleportCause cause);
  

Spigot-API-Patches/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch

@@ -1,4 +1,4 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From f909641ae51041c6ecd8af3fa5136461e8e8e7bf Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 14 Aug 2018 21:42:10 -0700
 Subject: [PATCH] Allow Blocks to be accessed via a long key
@@ -18,7 +18,7 @@ Y range: [0, 1023]
 X, Z range: [-67 108 864, 67 108 863]
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 8dcb15fb..7e1ee875 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
 @@ -10,7 +10,6 @@ import org.bukkit.util.Vector;
@@ -49,10 +49,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
       * @return A new location where X/Y/Z are the center of the block
       */
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 8e322cab..adace47c 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -73,6 +73,37 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -75,6 +75,37 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public Block getBlockAt(Location location);
  
@@ -91,10 +91,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
       * Gets the y coordinate of the lowest block at this position such that the
       * block and all blocks above it are transparent for lighting purposes.
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index d71815d1..e529e204 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
-@@ -139,6 +139,33 @@ public interface Block extends Metadatable {
+@@ -142,6 +142,33 @@ public interface Block extends Metadatable {
       */
      int getZ();
  

Spigot-API-Patches/0141-isChunkGenerated-API.patch

@@ -1,11 +1,11 @@
-From fbbca41aee75b1949e0b4133ad2a87923d28328e Mon Sep 17 00:00:00 2001
+From f36153fbc7b8b55a0bb0529803d9e1fc60c14f36 Mon Sep 17 00:00:00 2001
 From: cswhite2000 <18whitechristop@gmail.com>
 Date: Tue, 21 Aug 2018 19:39:46 -0700
 Subject: [PATCH] isChunkGenerated API
 
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 7e1ee875e..9457832bc 100644
+index 7e1ee875..9457832b 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
 @@ -9,6 +9,7 @@ import org.bukkit.util.NumberConversions;
@@ -33,10 +33,10 @@ index 7e1ee875e..9457832bc 100644
      /**
       * Sets the position of this Location and returns itself
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index c918c26be..d367e890f 100644
+index adace47c..de89122e 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -182,6 +182,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -184,6 +184,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
          return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
      }
  
@@ -55,5 +55,5 @@ index c918c26be..d367e890f 100644
       * This is the Legacy API before Java 8 was supported. Java 8 Consumer is provided,
       * as well as future support
 -- 
-2.19.0
+2.19.1
 

Spigot-API-Patches/0145-Add-Force-Loaded-Chunk-API.patch

@@ -1,11 +1,11 @@
-From f63d962bbe2d56e72384b92df8819041d1e57d54 Mon Sep 17 00:00:00 2001
+From 14a1db13c30927e0e9b1b1b9540aab8f749b1df7 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Wed, 29 Aug 2018 00:37:30 -0400
 Subject: [PATCH] Add Force-Loaded Chunk API
 
 
 diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index 8a8043351..4b9e0ca46 100644
+index 8a804335..4b9e0ca4 100644
 --- a/src/main/java/org/bukkit/Chunk.java
 +++ b/src/main/java/org/bukkit/Chunk.java
 @@ -168,4 +168,20 @@ public interface Chunk {
@@ -30,10 +30,10 @@ index 8a8043351..4b9e0ca46 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index d367e890f..7bfe0b684 100644
+index de89122e..aa28c452 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -193,6 +193,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -195,6 +195,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
          return isChunkGenerated((int) chunkKey, (int) (chunkKey >> 32));
      }
  
@@ -51,5 +51,5 @@ index d367e890f..7bfe0b684 100644
       * This is the Legacy API before Java 8 was supported. Java 8 Consumer is provided,
       * as well as future support
 -- 
-2.19.0
+2.19.1
 

Spigot-API-Patches/0147-Add-ray-tracing-methods-to-LivingEntity.patch

@@ -1,4 +1,4 @@
-From ced5f29550020b78316bb1e18dfa359bd080a9c4 Mon Sep 17 00:00:00 2001
+From b5c238367804b804eed5fd262a61d3b9eaf8128d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 3 Sep 2018 18:13:53 -0500
 Subject: [PATCH] Add ray tracing methods to LivingEntity
@@ -61,10 +61,10 @@ index 00000000..fe43d955
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index ac5bd8a5..62e45eda 100644
+index f4f60de2..c3c31f50 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -71,6 +71,77 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
+@@ -79,6 +79,77 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
       */
      public Block getTargetBlock(Set<Material> transparent, int maxDistance);
  
@@ -143,5 +143,5 @@ index ac5bd8a5..62e45eda 100644
       * Gets the last two blocks along the living entity's line of sight.
       * <p>
 -- 
-2.19.0
+2.19.1
 

Spigot-API-Patches/0160-Add-LivingEntity-getTargetEntity.patch

@@ -1,4 +1,4 @@
-From cd531bb730c2417a5715286b82d97394382314d8 Mon Sep 17 00:00:00 2001
+From ae10d61250d9ca7880f64c2a8923ea699696102d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Sep 2018 00:32:53 -0500
 Subject: [PATCH] Add LivingEntity#getTargetEntity
@@ -6,7 +6,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
 new file mode 100644
-index 000000000..5df8eed23
+index 00000000..5df8eed2
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
 @@ -0,0 +1,35 @@
@@ -46,10 +46,10 @@ index 000000000..5df8eed23
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 62e45eda2..a556586eb 100644
+index c3c31f50..263a94a7 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -140,6 +140,50 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
+@@ -148,6 +148,50 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
       */
      @Nullable
      public com.destroystokyo.paper.block.TargetBlockInfo getTargetBlockInfo(int maxDistance, com.destroystokyo.paper.block.TargetBlockInfo.FluidMode fluidMode);

Spigot-API-Patches/0161-Add-sun-related-API.patch

@@ -1,14 +1,14 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From 09dee3bad3aecdc375e9059a0679536b3dc2a23b Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:15 -0500
 Subject: [PATCH] Add sun related API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index aa28c452..27e58136 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1207,6 +1207,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1423,6 +1423,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public void setFullTime(long time);
  
@@ -26,7 +26,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
       * Returns whether the world has an ongoing storm.
       *
 diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 48eddcd3..1b108a4a 100644
 --- a/src/main/java/org/bukkit/entity/Mob.java
 +++ b/src/main/java/org/bukkit/entity/Mob.java
 @@ -13,6 +13,13 @@ public interface Mob extends LivingEntity, Lootable {