mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-27 07:14:50 +02:00
526795bacd
* Update patches to handle vineflower decompiler * update patches again to handle inlined simple lambdas * update vf again and re-apply/rebuild patches * update patches after removal of verify-merges flag * fix compile issue * remove maven local * fix some issues * address more issues * fix collision patch * use paperweight release * more fixes * update fineflower and fix patches again * add missing comment descriptor --------- Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
|
|
Date: Sun, 13 Dec 2020 05:32:12 +0200
|
|
Subject: [PATCH] Expose LivingEntity hurt direction
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
index 5ecfb98540c00da05b13bc5370debb89c52cc76f..083d5798ccc7f37c6df5e234c7ef233202102b8f 100644
|
|
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
@@ -348,6 +348,16 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
|
|
*/
|
|
public void setCooldown(@NotNull Material material, int ticks);
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Sets player hurt direction
|
|
+ *
|
|
+ * @param hurtDirection hurt direction
|
|
+ */
|
|
+ @Override
|
|
+ void setHurtDirection(float hurtDirection);
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Get the sleep ticks of the player. This value may be capped.
|
|
*
|
|
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
index bd871bf479cb9f4b31832ac5cb363f314b32a047..54cdbfdc5d2280069045317bac919ff4689872f5 100644
|
|
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
@@ -1199,4 +1199,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
|
*/
|
|
void playPickupItemAnimation(@NotNull Item item, int quantity);
|
|
// Paper end - pickup animation API
|
|
+
|
|
+ // Paper start - hurt direction API
|
|
+ /**
|
|
+ * Gets player hurt direction
|
|
+ *
|
|
+ * @return hurt direction
|
|
+ */
|
|
+ float getHurtDirection();
|
|
+
|
|
+ /**
|
|
+ * Sets player hurt direction
|
|
+ *
|
|
+ * @param hurtDirection hurt direction
|
|
+ * @deprecated use {@link Player#setHurtDirection(float)}
|
|
+ */
|
|
+ @Deprecated
|
|
+ void setHurtDirection(float hurtDirection);
|
|
+ // Paper end - hurt direction API
|
|
}
|