835bc39b03
Updated Upstream (Bukkit/CraftBukkit/Spigot) Bukkit Changes: 2dcc44dc SPIGOT-4307: Fix hacky API for banners on shields e0fc6572 SPIGOT-4309: Add "forced" display of particles efeeab2f Add index to README.md for easier navigation f502bc6f Update to Minecraft 1.13.1 CraftBukkit Changes: d0bb0a1d Fix some tests randomly failing 997d378d Fix client stall in specific teleportation scenarios b3dc2366 SPIGOT-4307: Fix hacky API for banners on shields 2a271162 SPIGOT-4301: Fix more invalid enchants 5d0d83bb SPIGOT-4309: Add "forced" display of particles a6772578 Add additional tests for CraftBlockData ce1af0c3 Update to Minecraft 1.13.1 Spigot Changes: 2440e189 Rebuild patches 4ecffced Update to Minecraft 1.13.1
44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
From 8f0a17d0053904bba6193e2f4d7c46931eb4d966 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 f8c91a13b..c9eb75aa7 100644
|
|
--- a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
|
|
@@ -16,9 +16,28 @@ 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 boolean getConsumeArrow() {
|
|
+ return consumeArrow;
|
|
+ }
|
|
+ public void setConsumeArrow(boolean consumeArrow) {
|
|
+ this.consumeArrow = consumeArrow;
|
|
+ }
|
|
|
|
+ public ItemStack getArrowItem() {
|
|
+ return arrowItem;
|
|
+ }
|
|
+
|
|
+ @Deprecated
|
|
public EntityShootBowEvent(final LivingEntity shooter, final ItemStack bow, final Projectile projectile, final float force) {
|
|
+ this(shooter, bow, new ItemStack(org.bukkit.Material.AIR), projectile, force);
|
|
+ }
|
|
+ public EntityShootBowEvent(final LivingEntity shooter, final ItemStack bow, ItemStack arrowItem, final Projectile projectile, final float force) {
|
|
super(shooter);
|
|
+ this.arrowItem = arrowItem;
|
|
+ // Paper end
|
|
this.bow = bow;
|
|
this.projectile = projectile;
|
|
this.force = force;
|
|
--
|
|
2.18.0
|
|
|