Spigot / Bukkit / 565a57274a4

Commits

Parker Hawke authored and md_5 committed 565a57274a4 31 Aug 2020

#533: Add consumed item, hand and consumeItem boolean to EntityShootBowEvent

src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java

Modified

-1
+package org.bukkit.event.entity;
-2
-3
+import org.bukkit.entity.Entity;
-4
+import org.bukkit.entity.LivingEntity;
-+
+import org.bukkit.entity.Player;
-6
+import org.bukkit.event.Cancellable;
-7
+import org.bukkit.event.HandlerList;
-+
+import org.bukkit.inventory.EquipmentSlot;
-9
+import org.bukkit.inventory.ItemStack;
-10
+import org.jetbrains.annotations.NotNull;
-11
+import org.jetbrains.annotations.Nullable;
-12
-13
+/**
-14
+ * Called when a LivingEntity shoots a bow firing an arrow
-15
+ */
-16
+public class EntityShootBowEvent extends EntityEvent implements Cancellable {
-17
+    private static final HandlerList handlers = new HandlerList();
-18
+    private final ItemStack bow;
-+
+    private final ItemStack consumable;
-20
+    private Entity projectile;
-+
+    private final EquipmentSlot hand;
-22
+    private final float force;
-+
+    private boolean consumeItem;
-24
+    private boolean cancelled;
-25
--
+    public EntityShootBowEvent(@NotNull final LivingEntity shooter, @Nullable final ItemStack bow, @NotNull final Entity projectile, final float force) {
-+
+    public EntityShootBowEvent(@NotNull final LivingEntity shooter, @Nullable final ItemStack bow, @Nullable final ItemStack consumable, @NotNull final Entity projectile, @NotNull final EquipmentSlot hand, final float force, final boolean consumeItem) {
-27
+        super(shooter);
-28
+        this.bow = bow;
-+
+        this.consumable = consumable;
-30
+        this.projectile = projectile;
-+
+        this.hand = hand;
-32
+        this.force = force;
-+
+        this.consumeItem = consumeItem;
-34
+    }
-35
-36
+    @NotNull
-37
+    @Override
-38
+    public LivingEntity getEntity() {
-39
+        return (LivingEntity) entity;
-40
+    }
-41
-42
+    /**
-43
+     * Gets the bow ItemStack used to fire the arrow.
-44
+     *
-45
+     * @return the bow involved in this event
-46
+     */
-47
+    @Nullable
-48
+    public ItemStack getBow() {
-49
+        return bow;
-50
+    }
-51
-+
+    /**
-+
+     * Get the ItemStack to be consumed in this event (if any).
-+
+     *
-+
+     * For instance, bows will consume an arrow ItemStack in a player's
-+
+     * inventory.
-+
+     *
-+
+     * @return the consumable item
-+
+     */
-+
+    @Nullable
-+
+    public ItemStack getConsumable() {
-+
+        return consumable;
-+
+    }
-+
-65
+    /**
-66
+     * Gets the projectile which will be launched by this event
-67
+     *
-68
+     * @return the launched projectile
-69
+     */
-70
+    @NotNull
-71
+    public Entity getProjectile() {
-72
+        return projectile;
-73
+    }
-74
-75
+    /**
-76
+     * Replaces the projectile which will be launched
-77
+     *
-78
+     * @param projectile the new projectile
-79
+     */
-80
+    public void setProjectile(@NotNull Entity projectile) {
-81
+        this.projectile = projectile;
-82
+    }
-83
-+
+    /**
-+
+     * Get the hand from which the bow was shot.
-+
+     *
-+
+     * @return the hand
-+
+     */
-+
+    @NotNull
-+
+    public EquipmentSlot getHand() {
-+
+        return hand;
-+
+    }
-+
-94
+    /**
-95
+     * Gets the force the arrow was launched with
-96
+     *
-97
+     * @return bow shooting force, up to 1.0
-98
+     */
-99
+    public float getForce() {
-100
+        return force;
-101
+    }
-102
-+
+    /**
-+
+     * Set whether or not the consumable item should be consumed in this event.
-+
+     *
-+
+     * If set to false, it is recommended that a call to
-+
+     * {@link Player#updateInventory()} is made as the client may disagree with
-+
+     * the server's decision to not consume a consumable item.
-+
+     * <p>
-+
+     * This value is ignored for entities where items are not required
-+
+     * (skeletons, pillagers, etc.) or with crossbows (as no item is being
-+
+     * consumed).
-+
+     *
-+
+     * @param consumeItem whether or not to consume the item
-+
+     */
-+
+    public void setConsumeItem(boolean consumeItem) {
-+
+        this.consumeItem = consumeItem;
-+
+    }
-+
-+
+    /**
-+
+     * Get whether or not the consumable item should be consumed in this event.
-+
+     *
-+
+     * @return true if consumed, false otherwise
-+
+     */
-+
+    public boolean shouldConsumeItem() {
-+
+        return consumeItem;
-+
+    }
-+
-129
+    @Override
-130
+    public boolean isCancelled() {
-131
+        return cancelled;
-132
+    }
-133
-134
+    @Override
-135
+    public void setCancelled(boolean cancel) {
-136
+        cancelled = cancel;
-137
+    }
-138

Bukkit

Commits

Jira Issues

Add shortcut