mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +01:00
1ab021ddca
Upstream has released updates that appears 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:
565a5727 #533: Add consumed item, hand and consumeItem boolean to EntityShootBowEvent
CraftBukkit Changes:
927200a9 #718: Add consumed item, hand and consumeItem boolean to EntityShootBowEvent
45 lines
2.1 KiB
Diff
45 lines
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sat, 15 Jun 2013 19:52:04 -0400
|
|
Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
|
|
|
|
Adds ability to get what arrow was shot, and control if it should be consumed.
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
|
|
index d4d7ad9c3c953680342c121f39ddaef476549047..719d0d878320c1903b44076053989ba99fa0e92a 100644
|
|
--- a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
|
|
@@ -22,7 +22,32 @@ public class EntityShootBowEvent extends EntityEvent implements Cancellable {
|
|
private final float force;
|
|
private boolean consumeItem;
|
|
private boolean cancelled;
|
|
+ // Paper start
|
|
+ @Deprecated
|
|
+ public void setConsumeArrow(boolean consumeArrow) {
|
|
+ this.setConsumeItem(consumeArrow);
|
|
+ }
|
|
+
|
|
+ @Deprecated
|
|
+ public boolean getConsumeArrow() {
|
|
+ return this.shouldConsumeItem();
|
|
+ }
|
|
+
|
|
+ @NotNull @Deprecated
|
|
+ public ItemStack getArrowItem() {
|
|
+ return this.getConsumable();
|
|
+ }
|
|
+
|
|
+ @Deprecated
|
|
+ public EntityShootBowEvent(@NotNull final LivingEntity shooter, @Nullable final ItemStack bow, @NotNull final Entity projectile, final float force) {
|
|
+ this(shooter, bow, new ItemStack(org.bukkit.Material.AIR), projectile, force);
|
|
+ }
|
|
|
|
+ @Deprecated
|
|
+ public EntityShootBowEvent(@NotNull final LivingEntity shooter, @Nullable final ItemStack bow, @NotNull ItemStack arrowItem, @NotNull final Entity projectile, final float force) {
|
|
+ this(shooter, bow, arrowItem, projectile, EquipmentSlot.HAND, force, true);
|
|
+ }
|
|
+ // Paper end
|
|
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) {
|
|
super(shooter);
|
|
this.bow = bow;
|