Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
ac554ad46d
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: fa99e752 PR-1007: Add ItemMeta#getAsComponentString() 94a91782 Fix copy-pasted BlockType.Typed documentation 9b34ac8c Largely restore deprecated PotionData API 51a6449b PR-1008: Deprecate ITEMS_TOOLS, removed in 1.20.5 702d15fe Fix Javadoc reference 42f6cdf4 PR-919: Add internal ItemType and BlockType, delegate Material methods to them 237bb37b SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent 035ea146 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it 8c7880fb PR-1004: Improve field rename handling and centralize conversion between bukkit and string more 87c90e93 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent CraftBukkit Changes: 4af0f22e8 SPIGOT-7664: Item meta should prevail over block states c2ccc46ec SPIGOT-7666: Fix access to llama and horse special slot 124ac66d7 SPIGOT-7665: Fix ThrownPotion#getEffects() implementation only bringing custom effects 66f1f439a Restore null page behaviour of signed books even though not strictly allowed by API 6118e5398 Fix regression listening to minecraft:brand custom payloads c1a26b366 Fix unnecessary and potential not thread-safe chat visibility check 12360a7ec Remove unused imports 147b098b4 PR-1397: Add ItemMeta#getAsComponentString() 428aefe0e Largely restore deprecated PotionData API afe5b5ee9 PR-1275: Add internal ItemType and BlockType, delegate Material methods to them 8afeafa7d SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent 4e7d749d4 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it 441880757 Support both entity_data and bucket_entity_data on axolotl/fish buckets 0e22fdd1e Fix custom direct BlockState being not correctly set in DamageSource f2182ed47 SPIGOT-7659: TropicalFishBucketMeta should use BUCKET_ENTITY_DATA 2a6207fe1 PR-1393: Improve field rename handling and centralize conversion between bukkit and string more c024a5039 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent 741b84480 PR-1390: Improve internal handling of damage sources 0364df4e1 SPIGOT-7657: Error when loading angry entities
64 Zeilen
2.2 KiB
Diff
64 Zeilen
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 ce5cf587ce44f2410c1d0bcf459b6309ec70bfee..f05883886928169600b6309dd12de3bdb633cca1 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>
|