mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-28 19:22:50 +01:00
c03e56be67
Our improved hopper checking system should provide a better benefit without as many vanilla behavior issues.
58 lines
1.9 KiB
Diff
58 lines
1.9 KiB
Diff
From d516471964dec4d3be6a8ad3c45ce9f2c5aa6ae4 Mon Sep 17 00:00:00 2001
|
|
From: Jedediah Smith <jedediah@silencegreys.com>
|
|
Date: Fri, 4 Mar 2016 03:16:11 -0500
|
|
Subject: [PATCH] Arrow pickup rule API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
|
|
index 2a3482c..fbf289f 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
|
|
@@ -72,6 +72,44 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
|
|
getHandle().shooter = ((CraftLivingEntity) shooter).getHandle();
|
|
}
|
|
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public PickupRule getPickupRule() {
|
|
+ return convertPickupRule(this.getHandle().fromPlayer);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setPickupRule(PickupRule rule) {
|
|
+ this.getHandle().fromPlayer = convertPickupRule(rule);
|
|
+ }
|
|
+
|
|
+ public static PickupRule convertPickupRule(EntityArrow.PickupStatus nms) {
|
|
+ switch (nms) {
|
|
+ case DISALLOWED:
|
|
+ return PickupRule.DISALLOWED;
|
|
+ case ALLOWED:
|
|
+ return PickupRule.ALLOWED;
|
|
+ case CREATIVE_ONLY:
|
|
+ return PickupRule.CREATIVE_ONLY;
|
|
+ default:
|
|
+ throw new IllegalStateException();
|
|
+ }
|
|
+ }
|
|
+
|
|
+ public static EntityArrow.PickupStatus convertPickupRule(PickupRule bukkit) {
|
|
+ switch (bukkit) {
|
|
+ case DISALLOWED:
|
|
+ return EntityArrow.PickupStatus.DISALLOWED;
|
|
+ case ALLOWED:
|
|
+ return EntityArrow.PickupStatus.ALLOWED;
|
|
+ case CREATIVE_ONLY:
|
|
+ return EntityArrow.PickupStatus.CREATIVE_ONLY;
|
|
+ default:
|
|
+ throw new IllegalStateException();
|
|
+ }
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
// Spigot start
|
|
private final Arrow.Spigot spigot = new Arrow.Spigot()
|
|
{
|
|
--
|
|
2.9.0
|
|
|