mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 12:36:07 +01:00
b077005910
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: fd28180e #479: Add LivingEntity#attack, LivingEntity#swingMainHand, LivingEntity#swingOffHand ae72ba3a SPIGOT-5591: Allow concurrent potion effects CraftBukkit Changes:3d61a853Fix formatting in CraftLivingEntityf7ab3055#633: Add LivingEntity#attack, LivingEntity#swingMainHand, LivingEntity#swingOffHandd5ef2eabSPIGOT-5591: Allow concurrent potion effects25a9a9ffSPIGOT-5592: Custom ChunkGenerator can cause bugged dirt3f6d0de9Make it clear in error messages that api-version above 1.13 is also supported
30 lines
926 B
Diff
30 lines
926 B
Diff
From c7c6e0f77754ecb3b0a30e5f64b9003bfb66a76c 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 52541e496..ae712e76d 100644
|
|
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
@@ -250,6 +250,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
|
@Nullable
|
|
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.
|
|
*
|
|
--
|
|
2.25.0
|
|
|