mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 12:41:50 +01:00
bd38e0318a
Updated Upstream (Bukkit/CraftBukkit) 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: f02baa38 PR-988: Add World#getIntersectingChunks(BoundingBox) 9321d665 Move getItemInUse up to LivingEntity 819eef73 PR-959: Add access to current item's remaining ticks c4fdadb0 SPIGOT-7601: Add AbstractArrow#getItem be8261ca Add support for Java 22 26119676 PR-979: Add more translation keys 66753362 PR-985: Correct book maximum pages and characters per page documentation c8be92fa PR-980: Improve getArmorContents() documentation f1120ee2 PR-983: Expose riptide velocity to PlayerRiptideEvent CraftBukkit Changes: dfaa89bbe PR-1369: Add World#getIntersectingChunks(BoundingBox) 51bbab2b9 Move getItemInUse up to LivingEntity 668e09602 PR-1331: Add access to current item's remaining ticks a639406d1 SPIGOT-7601: Add AbstractArrow#getItem 0398930fc SPIGOT-7602: Allow opening in-world horse and related inventories ffd15611c SPIGOT-7608: Allow empty lists to morph to any PDT list 2188dcfa9 Add support for Java 22 45d6a609f SPIGOT-7604: Revert "SPIGOT-7365: DamageCause blocked by shield should trigger invulnerableTime" 06d915943 SPIGOT-7365: DamageCause blocked by shield should trigger invulnerableTime ca3bc3707 PR-1361: Add more translation keys 366c3ca80 SPIGOT-7600: EntityChangeBlockEvent is not fired for frog eggs 06d0f9ba8 SPIGOT-7593: Fix sapling growth physics / client-side updates 45c2608e4 PR-1366: Expose riptide velocity to PlayerRiptideEvent 29b6bb79b SPIGOT-7587: Remove fixes for now-resolved MC-142590 and MC-109346
63 lines
2.2 KiB
Diff
63 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
|
|
Date: Tue, 22 Jun 2021 23:16:11 -0400
|
|
Subject: [PATCH] Stinger API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
index 13eb80455dd589e87c39a7a5570ef093c7660205..2727eef973a40b5d96f59671e0415e9544a0550c 100644
|
|
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
@@ -451,6 +451,52 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
|
int getNextArrowRemoval();
|
|
// Paper end - Add methods for working with arrows stuck in living entities
|
|
|
|
+ // Paper start - Bee Stinger API
|
|
+ /**
|
|
+ * Gets the time in ticks until the next bee stinger leaves the entity's body.
|
|
+ *
|
|
+ * @return ticks until bee stinger leaves
|
|
+ */
|
|
+ public int getBeeStingerCooldown();
|
|
+
|
|
+ /**
|
|
+ * Sets the time in ticks until the next stinger leaves the entity's body.
|
|
+ *
|
|
+ * @param ticks time until bee stinger leaves
|
|
+ */
|
|
+ public void setBeeStingerCooldown(int ticks);
|
|
+
|
|
+ /**
|
|
+ * Gets the amount of bee stingers in an entity's body.
|
|
+ *
|
|
+ * @return amount of bee stingers in body
|
|
+ */
|
|
+ public int getBeeStingersInBody();
|
|
+
|
|
+ /**
|
|
+ * Set the amount of bee stingers in the entity's body.
|
|
+ *
|
|
+ * @param count amount of bee stingers in entity's body
|
|
+ */
|
|
+ public void setBeeStingersInBody(int count);
|
|
+
|
|
+ /**
|
|
+ * Sets the amount of ticks before the next bee stinger gets removed from the entities body.
|
|
+ * <p>
|
|
+ * A value of 0 will cause the server to re-calculate the amount of ticks on the next tick.
|
|
+ *
|
|
+ * @param ticks Amount of ticks
|
|
+ */
|
|
+ void setNextBeeStingerRemoval(@org.jetbrains.annotations.Range(from = 0, to = Integer.MAX_VALUE) int ticks);
|
|
+
|
|
+ /**
|
|
+ * Gets the amount of ticks before the next bee stinger gets removed from the entities body.
|
|
+ *
|
|
+ * @return ticks Amount of ticks
|
|
+ */
|
|
+ int getNextBeeStingerRemoval();
|
|
+ // Paper end - Stinger API
|
|
+
|
|
/**
|
|
* Returns the living entity's current maximum no damage ticks.
|
|
* <p>
|