36f34f01c0
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: da9ef3c5 #496: Add methods to get/set ItemStacks in EquipmentSlots 3abebc9f #492: Let Tameable extend Animals rather than Entity 941111a0 #495: Expose ItemStack and hand used in PlayerShearEntityEvent 4fe19cae #494: InventoryView - Add missing Brewing FUEL_TIME CraftBukkit Changes: 933e9094 #664: Add methods to get/set ItemStacks in EquipmentSlots 18722312 #662: Expose ItemStack and hand used in PlayerShearEntityEvent
49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jedediah Smith <jedediah@silencegreys.com>
|
|
Date: Fri, 4 Mar 2016 03:13:18 -0500
|
|
Subject: [PATCH] Arrow pickup rule API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java
|
|
index 88cebc004feeef65a594939a7e865b445432a83e..b2bf62a50177e612369993f8ed340d456c3c2fc8 100644
|
|
--- a/src/main/java/org/bukkit/entity/AbstractArrow.java
|
|
+++ b/src/main/java/org/bukkit/entity/AbstractArrow.java
|
|
@@ -127,4 +127,38 @@ public interface AbstractArrow extends Projectile {
|
|
*/
|
|
CREATIVE_ONLY
|
|
}
|
|
+
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the {@link PickupRule} for this arrow.
|
|
+ *
|
|
+ * <p>This is generally {@link PickupRule#ALLOWED} only if the arrow was
|
|
+ * <b>not</b> fired from a bow with the infinity enchantment.</p>
|
|
+ *
|
|
+ * @return The pickup rule
|
|
+ * @deprecated Use {@link Arrow#getPickupStatus()} as an upstream compatible replacement for this function
|
|
+ */
|
|
+ @Deprecated
|
|
+ default PickupRule getPickupRule() {
|
|
+ return PickupRule.valueOf(this.getPickupStatus().name());
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Set the rule for which players can pickup this arrow as an item.
|
|
+ *
|
|
+ * @param rule The pickup rule
|
|
+ * @deprecated Use {@link Arrow#setPickupStatus(PickupStatus)} with {@link PickupStatus} as an upstream compatible replacement for this function
|
|
+ */
|
|
+ @Deprecated
|
|
+ default void setPickupRule(PickupRule rule) {
|
|
+ this.setPickupStatus(PickupStatus.valueOf(rule.name()));
|
|
+ }
|
|
+
|
|
+ @Deprecated
|
|
+ enum PickupRule {
|
|
+ DISALLOWED,
|
|
+ ALLOWED,
|
|
+ CREATIVE_ONLY;
|
|
+ }
|
|
+ // Paper end
|
|
}
|