Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
4d20922b79
* Updated Upstream (Bukkit/CraftBukkit/Spigot) 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: e86f4dc4 PR-1041: Improve getPlayer(String) docs to clarify it matches the name 9738f005 Fix spawner API documentation 69ebd9fd PR-1034: Add TrialSpawnerSpawnEvent 23cffd9c PR-973: Improve spawner API and add API for Trial Spawners 8bf19163 PR-1038: Clarify HumanEntity#openInventory(InventoryView) JavaDoc 1ff76351 SPIGOT-7732, SPIGOT-7786: Add freezing damage modifier 02161cb4 PR-1034: Add CreatureSpawnEvent.SpawnReason#TRIAL_SPAWNER f9cb6f34 SPIGOT-7777: All entity potion effects are removed on death 25d548eb PR-1031: Expose Creeper igniter ccbf0915 SPIGOT-7770: Reserve spaces in shaped recipes for blank ingredients 17f7097c Clarify ambiguity around what is API 71714f0c Remove note from InventoryView JavaDoc aaf49731 PR-1030: Deprecate more unused methods in UnsafeValues 3a9dc689 SPIGOT-7771: Material.getDefaultAttributes always returns an empty map CraftBukkit Changes: c3ceeb6f7 SPIGOT-7814: Call PlayerShearEntityEvent for Bogged 97b1e4f58 Fix wolf armor not dropping from use of shears fd2ef563a SPIGOT-7812: Revert "SPIGOT-7809: Restore shield/banner conversion for base colours" f672c351b SPIGOT-7811: Enchantments are applied on sweeping attack even if damage event is cancelled cfe29350b SPIGOT-7808: Fix implementation of Enchantment#getName() for bad name return 19335f69e SPIGOT-7809: Restore shield/banner conversion for base colours ae4f5a0be SPIGOT-7805: Fix jukebox deserialization 62e3b73a4 SPIGOT-7804: Fix written book serialization aac911d26 SPIGOT-7800, SPIGOT-7801: Keep vanilla behaviour for items dropped on player death 13ece474f PR-1429: Implement TrialSpawnerSpawnEvent bf13e9113 PR-1354: Improve spawner API and add API for Trial Spawners 515fe49e1 Increase outdated build delay 9cd5a19a0 SPIGOT-7794: Cancelling InventoryItemMoveEvent destroys items ce40c7b14 SPIGOT-7796: Kickplayer newlines not working 5167256ff SPIGOT-7795: Fix damage/stats ignore the invulnerable damage time f993563ee Improve cross-world teleportation handling ab29122cf PR-1433: HumanEntity#openInventory(InventoryView) should only support views belonging to the player 764a541c5 SPIGOT-7732: Issue with the "hurt()" method of EntityLiving and invulnerable time 820084b5f SPIGOT-7791: Skull BlockState with null profile causes NullPointerException 5e46f1c82 SPIGOT-7785: Teleporting a player at the right moment can mess up vanilla teleportation cbd95a6b3 SPIGOT-7772: Include hidden / non-sampled players in player count 3153debc5 SPIGOT-7790: Server crashes after bee nest is forced to update e77bb26bb SPIGOT-7788: The healing power of friendship advancement is never granted ee3d7258a SPIGOT-7789: Fix NPE in CraftMetaFirework applyToItem 2889b3a11 PR-1429: Add CreatureSpawnEvent.SpawnReason#TRIAL_SPAWNER cdd05bc7f SPIGOT-7777: Speed attribute stays after death; missing EntityPotionEffectEvent call d0e6af2d4 PR-1428: Expose Creeper igniter d01c70e93 PR-1425: Fix bytecode transformation taking care of class-to-interface compatibility. b2b08f68c SPIGOT-7770: Fix certain shaped recipes not registering 3f8e4161f PR-1426: Deprecate more unused methods in UnsafeValues 2c9dd879e SPIGOT-7771: Material.getDefaultAttributes always returns an empty map Spigot Changes: 491f3675 Rebuild patches 0a642bd7 Rebuild patches 8897571b Rebuild patches cb8cf80c Fix newlines in custom restart message 1aabe506 Rebuild patches
190 Zeilen
6.9 KiB
Diff
190 Zeilen
6.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Fri, 29 Jun 2018 00:19:19 -0400
|
|
Subject: [PATCH] LivingEntity Active Item API
|
|
|
|
API relating to items being actively used by a LivingEntity
|
|
such as a bow or eating food.
|
|
|
|
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
index 48bb08cc7c0af6ebb905d1e175ada0fd7944ca48..ee3086661e11d3d8faec30590be7131648d3b82a 100644
|
|
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
@@ -325,7 +325,9 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
|
|
* blocking).
|
|
*
|
|
* @return Whether their hand is raised
|
|
+ * @see LivingEntity#hasActiveItem()
|
|
*/
|
|
+ @org.jetbrains.annotations.ApiStatus.Obsolete(since = "1.20.4") // Paper - active item API
|
|
public boolean isHandRaised();
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
index 7b53064364e206bc1a0f4b7af4931f6c658b7c55..0ed64618b3f62ee984fe4f99dc6a52d5fad7b3cc 100644
|
|
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
@@ -202,15 +202,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
|
*
|
|
* @return the item being used by the player, or null if they are not using
|
|
* an item
|
|
+ * @deprecated Use {@link #getActiveItem()}
|
|
*/
|
|
@Nullable
|
|
+ @Deprecated(forRemoval = true, since = "1.20.4") // Paper
|
|
public ItemStack getItemInUse();
|
|
|
|
/**
|
|
* Gets the number of ticks remaining for the current item's usage.
|
|
*
|
|
* @return The number of ticks remaining
|
|
+ * @deprecated use {@link #getActiveItemRemainingTime()}
|
|
*/
|
|
+ @Deprecated(forRemoval = true, since = "1.20.4") // Paper
|
|
public int getItemInUseTicks();
|
|
|
|
/**
|
|
@@ -219,7 +223,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
|
* or throwing a trident.
|
|
*
|
|
* @param ticks The number of ticks remaining
|
|
+ * @deprecated use {@link #setActiveItemRemainingTime(int)}
|
|
*/
|
|
+ @Deprecated(forRemoval = true, since = "1.20.4") // Paper
|
|
public void setItemInUseTicks(int ticks);
|
|
|
|
/**
|
|
@@ -852,4 +858,130 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
|
*/
|
|
void setShieldBlockingDelay(int delay);
|
|
// Paper end
|
|
+
|
|
+ // Paper start - active item API
|
|
+ /**
|
|
+ * Starts using the item in the specified hand, making it the
|
|
+ * currently active item. When, for example, called on a skeleton,
|
|
+ * this will cause it to start drawing its bow.
|
|
+ * <p>
|
|
+ * Only HAND or OFF_HAND may be used for the hand parameter.
|
|
+ * <p>
|
|
+ * When used on a player, the client will stop using the item
|
|
+ * if right click is held down.
|
|
+ * <p>
|
|
+ * This method does not make any guarantees about the effect of this method
|
|
+ * as such depends on the entity and its state.
|
|
+ *
|
|
+ * @param hand the hand that contains the item to be used
|
|
+ */
|
|
+ @org.jetbrains.annotations.ApiStatus.Experimental
|
|
+ void startUsingItem(@NotNull org.bukkit.inventory.EquipmentSlot hand);
|
|
+
|
|
+ /**
|
|
+ * Finishes using the currently active item. When, for example, a
|
|
+ * skeleton is drawing its bow, this will cause it to release and
|
|
+ * fire the arrow.
|
|
+ * <p>
|
|
+ * This method does not make any guarantees about the effect of this method
|
|
+ * as such depends on the entity and its state.
|
|
+ */
|
|
+ @org.jetbrains.annotations.ApiStatus.Experimental
|
|
+ void completeUsingActiveItem();
|
|
+
|
|
+ /**
|
|
+ * Gets the item being actively "used" or consumed.
|
|
+ *
|
|
+ * @return the item
|
|
+ */
|
|
+ org.bukkit.inventory.@NotNull ItemStack getActiveItem();
|
|
+
|
|
+ /**
|
|
+ * Gets the remaining number of ticks for {@link #getActiveItem()}'s usage.
|
|
+ *
|
|
+ * @return remaining ticks to use {@link #getActiveItem()}
|
|
+ */
|
|
+ int getActiveItemRemainingTime();
|
|
+
|
|
+ /**
|
|
+ * Sets the number of ticks that remain for {@link #getActiveItem()}'s
|
|
+ * usage.
|
|
+ * <p>
|
|
+ * Valid values are between 0 and the max item use duration for
|
|
+ * the specific item type.
|
|
+ *
|
|
+ * @param ticks time in ticks remaining
|
|
+ */
|
|
+ void setActiveItemRemainingTime(@org.jetbrains.annotations.Range(from = 0, to = Integer.MAX_VALUE) int ticks);
|
|
+
|
|
+ /**
|
|
+ * Gets if the entity is using an item (eating, drinking, etc).
|
|
+ *
|
|
+ * @return true if using an item
|
|
+ */
|
|
+ boolean hasActiveItem();
|
|
+
|
|
+ /**
|
|
+ * Get how long the {@link #getActiveItem()} has been in use for.
|
|
+ *
|
|
+ * @return time used in ticks
|
|
+ */
|
|
+ int getActiveItemUsedTime();
|
|
+
|
|
+ /**
|
|
+ * Get the hand using the active item. Will be either
|
|
+ * {@link org.bukkit.inventory.EquipmentSlot#HAND} or
|
|
+ * {@link org.bukkit.inventory.EquipmentSlot#OFF_HAND}.
|
|
+ *
|
|
+ * @return the hand being used
|
|
+ */
|
|
+ org.bukkit.inventory.@NotNull EquipmentSlot getActiveItemHand();
|
|
+
|
|
+ /**
|
|
+ * Gets remaining time a player needs to keep hands raised with an item to finish using it.
|
|
+ *
|
|
+ * @return remaining ticks to use the item
|
|
+ * @see #getActiveItemRemainingTime()
|
|
+ */
|
|
+ @org.jetbrains.annotations.ApiStatus.Obsolete(since = "1.20.4")
|
|
+ default int getItemUseRemainingTime() {
|
|
+ return this.getActiveItemRemainingTime();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Get how long the entity's hands have been raised (Charging Bow attack, using a potion, etc)
|
|
+ *
|
|
+ * @return Get how long the players hands have been raised (Charging Bow attack, using a potion, etc)
|
|
+ * @see #getActiveItemUsedTime()
|
|
+ */
|
|
+ @org.jetbrains.annotations.ApiStatus.Obsolete(since = "1.20.4")
|
|
+ default int getHandRaisedTime() {
|
|
+ return this.getActiveItemUsedTime();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Whether this entity is using or charging an attack (Bow pulled back, drinking potion, eating food)
|
|
+ *
|
|
+ * @return whether this entity is using or charging an attack (Bow pulled back, drinking potion, eating food)
|
|
+ * @see #hasActiveItem()
|
|
+ */
|
|
+ @org.jetbrains.annotations.ApiStatus.Obsolete(since = "1.20.4")
|
|
+ default boolean isHandRaised() {
|
|
+ return this.hasActiveItem();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the hand raised by this living entity. Will be either
|
|
+ * {@link org.bukkit.inventory.EquipmentSlot#HAND} or
|
|
+ * {@link org.bukkit.inventory.EquipmentSlot#OFF_HAND}.
|
|
+ *
|
|
+ * @return the hand raised
|
|
+ * @see #getActiveItemHand()
|
|
+ */
|
|
+ @NotNull
|
|
+ @org.jetbrains.annotations.ApiStatus.Obsolete(since = "1.20.4")
|
|
+ default org.bukkit.inventory.EquipmentSlot getHandRaised() {
|
|
+ return this.getActiveItemHand();
|
|
+ }
|
|
+ // Paper end - active item API
|
|
}
|