diff --git a/Spigot-API-Patches/0066-LivingEntity-setKiller.patch b/Spigot-API-Patches/0066-LivingEntity-setKiller.patch
new file mode 100644
index 000000000..8cc14fa1d
--- /dev/null
+++ b/Spigot-API-Patches/0066-LivingEntity-setKiller.patch
@@ -0,0 +1,38 @@
+From b97b934d735fcb6dceca929737d660db73602ccd 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 be51e389..4a51c519 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;
+ 
++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
+      */
+     public Player getKiller();
+ 
++    // Paper start
++    /**
++     * Sets the player identified as the killer of the living entity.
++     *
++     * @param killer player
++     */
++    public void setKiller(@Nullable Player killer);
++    // Paper end
++
+     /**
+      * Adds the given {@link PotionEffect} to the living entity.
+      * <p>
+-- 
+2.14.1.windows.1
+
diff --git a/Spigot-Server-Patches/0235-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0235-LivingEntity-setKiller.patch
new file mode 100644
index 000000000..3ad4c7333
--- /dev/null
+++ b/Spigot-Server-Patches/0235-LivingEntity-setKiller.patch
@@ -0,0 +1,30 @@
+From 2b31d6190696de739cbbf6f5450d4fb2d3cc4117 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <Blake.Galbreath@GMail.com>
+Date: Mon, 31 Jul 2017 01:49:48 -0500
+Subject: [PATCH] LivingEntity#setKiller
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+index 1eafdecb4..f81622a34 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+@@ -256,6 +256,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+         return getHandle().killer == null ? null : (Player) getHandle().killer.getBukkitEntity();
+     }
+ 
++    // Paper start
++    @Override
++    public void setKiller(Player killer) {
++        EntityPlayer entityPlayer = killer == null ? null : ((CraftPlayer) killer).getHandle();
++        getHandle().killer = entityPlayer;
++        getHandle().lastDamager = entityPlayer;
++        getHandle().lastDamageByPlayerTime = entityPlayer == null ? 0 : 100; // 100 value taken from EntityLiving#damageEntity
++    }
++    // Paper end
++
+     public boolean addPotionEffect(PotionEffect effect) {
+         return addPotionEffect(effect, false);
+     }
+-- 
+2.14.1.windows.1
+