37 lines
1.9 KiB
Diff
37 lines
1.9 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Nesaak <52047222+Nesaak@users.noreply.github.com>
|
||
|
|
Date: Sat, 23 May 2020 10:31:11 -0400
|
||
|
|
Subject: [PATCH] Expose Arrow getItemStack
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
|
||
|
|
index 3ce431c1fdf1f5bd62b49f26cca188e939e98efa..6225f390b51733217a809910182f58acea1055e2 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
|
||
|
|
@@ -556,6 +556,7 @@ public abstract class AbstractArrow extends Projectile {
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
+ public final ItemStack getOriginalItemStack() { return getPickupItem(); } // Paper - OBFHELPER - exists purely due to overrides all as protected and dont want to change them all
|
||
|
|
protected abstract ItemStack getPickupItem();
|
||
|
|
|
||
|
|
@Override
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
|
||
|
|
index 5b898118a46007a85254931c7b5bd18d7cda99be..91d32aff07e81608a2f8ecb1301ef3c08533494b 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
|
||
|
|
@@ -102,6 +102,13 @@ public class CraftArrow extends AbstractProjectile implements AbstractArrow {
|
||
|
|
getHandle().pickup = net.minecraft.world.entity.projectile.AbstractArrow.Pickup.byOrdinal(status.ordinal());
|
||
|
|
}
|
||
|
|
|
||
|
|
+ // Paper start
|
||
|
|
+ @Override
|
||
|
|
+ public org.bukkit.craftbukkit.inventory.CraftItemStack getItemStack() {
|
||
|
|
+ return org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(getHandle().getOriginalItemStack());
|
||
|
|
+ }
|
||
|
|
+ //Paper end
|
||
|
|
+
|
||
|
|
@Override
|
||
|
|
public void setTicksLived(int value) {
|
||
|
|
super.setTicksLived(value);
|