mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-04 22:14:40 +01:00
e4d10a6d67
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: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes:bbe3d58eSPIGOT-5650: Lectern.setPage(int) causes a NullPointerException3075579fAdd FaceAttachable interface to handle Grindstone facing in common with Switches95bd4238SPIGOT-5647: ZombieVillager entity should have getVillagerType()4d975ac3SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
52 lines
1.6 KiB
Diff
52 lines
1.6 KiB
Diff
From 9b6b76c82b9ea8b2ac5a9994b7404972c653eb73 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 88cebc004..b2bf62a50 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
|
|
}
|
|
--
|
|
2.25.1
|
|
|