mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-09 04:09:54 +01:00
c0936a71bd
Upstream has released updates that appear 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: 01aa02eb PR-858: Add LivingEntity#playHurtAnimation() 9421320f PR-884: Refinements to new ban API for improved compatibility and correctness 37a60b45 SPIGOT-6455, SPIGOT-7030, PR-750: Improve ban API 4eeb174b All smithing inventories are now the new smithing inventory f2bb168e PR-880: Add methods to get/set FallingBlock CancelDrop e7a807fa PR-879: Add Player#sendHealthUpdate() 692b8e96 SPIGOT-7370: Remove float value conversion in plugin.yml 2d033390 SPIGOT-7403: Add direct API for waxed signs 16a08373 PR-876: Add missing Raider API and 'no action ticks' CraftBukkit Changes: b60a95c8c PR-1189: Add LivingEntity#playHurtAnimation() 95c335c63 PR-1226: Fix VehicleEnterEvent not being called for certain entities 0a0fc3bee PR-1227: Refinements to new ban API for improved compatibility and correctness 0d0b1e5dc Revert bad change to PathfinderGoalSit causing all cats to sit 648196070 SPIGOT-6455, SPIGOT-7030, PR-1054: Improve ban API 31fe848d6 All smithing inventories are now the new smithing inventory 9a919a143 SPIGOT-7416: SmithItemEvent not firing in Smithing Table 9f64f0d22 PR-1221: Add methods to get/set FallingBlock CancelDrop 3be9ac171 PR-1220: Add Player#sendHealthUpdate() c1279f775 PR-1209: Clean up various patches c432e4397 Fix Raider#setCelebrating() implementation 504d96665 SPIGOT-7403: Add direct API for waxed signs c68c1f1b3 PR-1216: Add missing Raider API and 'no action ticks' 85b89c3dd Increase outdated build delay Spigot Changes: 9ebce8af Rebuild patches 64b565e6 Rebuild patches
66 lines
2.4 KiB
Diff
66 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: mrapple <tony@oc.tc>
|
|
Date: Sun, 25 Nov 2012 13:47:27 -0600
|
|
Subject: [PATCH] Add methods for working with arrows stuck in living entities
|
|
|
|
Upstream added methods for this so the original methods
|
|
are now deprecated
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
index 7c82644de3c438f45476ac02ce2c51c6fdbd543a..390bb294d09389877937ee2c6c3f346e65dfb178 100644
|
|
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
@@ -215,12 +215,26 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
|
*/
|
|
public int getArrowsInBody();
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Set the amount of arrows in the entity's body.
|
|
+ * <p>
|
|
+ * Does not fire the {@link org.bukkit.event.entity.ArrowBodyCountChangeEvent}.
|
|
+ *
|
|
+ * @param count amount of arrows in entity's body
|
|
+ */
|
|
+ default void setArrowsInBody(final int count) {
|
|
+ this.setArrowsInBody(count, false);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Set the amount of arrows in the entity's body.
|
|
*
|
|
* @param count amount of arrows in entity's body
|
|
+ * @param fireEvent whether to fire the {@link org.bukkit.event.entity.ArrowBodyCountChangeEvent} event
|
|
*/
|
|
- public void setArrowsInBody(int count);
|
|
+ void setArrowsInBody(int count, boolean fireEvent); // Paper
|
|
|
|
/**
|
|
* Returns the living entity's current maximum no damage ticks.
|
|
@@ -722,4 +736,24 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
|
* @return Whether the entity is invisible
|
|
*/
|
|
public boolean isInvisible();
|
|
+
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Get the number of arrows stuck in this entity
|
|
+ * @return Number of arrows stuck
|
|
+ * @deprecated use {@link #getArrowsInBody()}
|
|
+ */
|
|
+ @Deprecated
|
|
+ int getArrowsStuck();
|
|
+
|
|
+ /**
|
|
+ * Set the number of arrows stuck in this entity
|
|
+ *
|
|
+ * @param arrows Number of arrows to stick in this entity
|
|
+ * @deprecated use {@link #setArrowsInBody(int, boolean)}. <b>This method previously fired {@link org.bukkit.event.entity.ArrowBodyCountChangeEvent} so if
|
|
+ * you want to retain exact functionality, pass {@code true} for {@code fireEvent}.</b>
|
|
+ */
|
|
+ @Deprecated
|
|
+ void setArrowsStuck(int arrows);
|
|
+ // Paper end
|
|
}
|