mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 19:52:55 +01:00
1e39773b53
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 9d0221aa API to get client side view distance. 9be7f0ea SPIGOT-4395: Additions to PlayerBedEnterEvent. 01e534c6 Minor cosmetic cleanups to imports etc CraftBukkit Changes:96c461b3API to get client side view distance.e2785f4eRemove note about development builda8000588SPIGOT-4395: Additions to PlayerBedEnterEvent. Spigot Changes: 117d4f7e Rebuild patches
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From b267465c0b09938121dd4582c5a62ae80d90da48 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 f67711fd7..3f93b70c1 100644
|
|
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
@@ -17,6 +17,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
|
|
*/
|
|
@@ -239,6 +241,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
|
*/
|
|
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.19.1
|
|
|