mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-04 10:11:29 +01:00
cac7bbc139
I misread the code and thought the code kept looping until the mob spawn cap was hit. Upon furthur review, this is not true, so this patch doesn't do anything sane.
58 lines
2 KiB
Diff
58 lines
2 KiB
Diff
From 0000000000000000000000000000000000000000 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
|
|
@@ -0,0 +0,0 @@ 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.7.4 (Apple Git-66)
|
|
|