mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-04 09:50:03 +01:00
57dd397155
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: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes:77fd87e4SPIGOT-2304: Implement LootGenerateEventa1a705eeSPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent41712eddSPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
54 lines
2.1 KiB
Diff
54 lines
2.1 KiB
Diff
From 80f0a8045024b522a4a136caaa43d047b16bbd81 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 18c5e31ab..37dbc12eb 100644
|
|
--- a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
|
|
@@ -2,6 +2,7 @@ package org.bukkit.event.entity;
|
|
|
|
import org.bukkit.entity.Entity;
|
|
import org.bukkit.entity.LivingEntity;
|
|
+import org.bukkit.entity.Projectile; // Paper
|
|
import org.bukkit.event.Cancellable;
|
|
import org.bukkit.event.HandlerList;
|
|
import org.bukkit.inventory.ItemStack;
|
|
@@ -17,9 +18,30 @@ public class EntityShootBowEvent extends EntityEvent implements Cancellable {
|
|
private Entity projectile;
|
|
private final float force;
|
|
private boolean cancelled;
|
|
+ // Paper start
|
|
+ private boolean consumeArrow = true;
|
|
+ private final ItemStack arrowItem;
|
|
+ public void setConsumeArrow(boolean consumeArrow) {
|
|
+ this.consumeArrow = consumeArrow;
|
|
+ }
|
|
+ public boolean getConsumeArrow() {
|
|
+ return consumeArrow;
|
|
+ }
|
|
|
|
+ @NotNull
|
|
+ public ItemStack getArrowItem() {
|
|
+ return arrowItem;
|
|
+ }
|
|
+
|
|
+ @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);
|
|
+ }
|
|
+
|
|
+ public EntityShootBowEvent(@NotNull final LivingEntity shooter, @Nullable final ItemStack bow, @NotNull ItemStack arrowItem, @NotNull final Entity projectile, final float force) {
|
|
super(shooter);
|
|
+ this.arrowItem = arrowItem;
|
|
+ // Paper end
|
|
this.bow = bow;
|
|
this.projectile = projectile;
|
|
this.force = force;
|
|
--
|
|
2.26.2
|
|
|