mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-03 01:10:37 +01:00
31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
|
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
|
||
|
|
|