Update upstream B/CB/S

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