Paper/Spigot-Server-Patches/0140-Arrow-pickup-rule-API.patch

59 Zeilen
1.9 KiB
Diff

2016-06-09 05:57:14 +02:00
From 5e6f62e26308239337b2a112df5fe8247e4eb9c0 Mon Sep 17 00:00:00 2001
2016-04-22 09:07:16 +02:00
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()
{
--
2016-06-09 05:57:14 +02:00
2.8.3
2016-04-22 09:07:16 +02:00