mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 17:07:43 +01:00
84e7469798
Upstream has released updates that appears to apply and compile correctly Paper Changes: 4a97a7ca Add option to disable pillager patrols (#2626) 23e53aab Backport MC-160177 fix from 1.15 (#2702) 45089d59 Update upstream CB 761c24fa Fix stuck in sneak when changing worlds (MC-10657) (#2627)
43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
From c5fecee384e8f908932c82f11ed61330c554a234 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Fri, 18 Oct 2019 22:19:40 -0500
|
|
Subject: [PATCH] Expose getItemStack for Trident
|
|
|
|
---
|
|
.../java/net/minecraft/server/EntityThrownTrident.java | 2 +-
|
|
.../java/org/bukkit/craftbukkit/entity/CraftTrident.java | 7 +++++++
|
|
2 files changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityThrownTrident.java b/src/main/java/net/minecraft/server/EntityThrownTrident.java
|
|
index 392cadf310..46e816dadd 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityThrownTrident.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityThrownTrident.java
|
|
@@ -74,7 +74,7 @@ public class EntityThrownTrident extends EntityArrow {
|
|
}
|
|
|
|
@Override
|
|
- protected ItemStack getItemStack() {
|
|
+ public ItemStack getItemStack() { // Purpur - protected -> public
|
|
return this.trident.cloneItemStack();
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
|
|
index 0518e6c683..63287a9b65 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
|
|
@@ -25,4 +25,11 @@ public class CraftTrident extends CraftArrow implements Trident {
|
|
public EntityType getType() {
|
|
return EntityType.TRIDENT;
|
|
}
|
|
+
|
|
+ // Purpur start
|
|
+ @Override
|
|
+ public org.bukkit.inventory.ItemStack getItemStack() {
|
|
+ return org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(getHandle().getItemStack());
|
|
+ }
|
|
+ // Purpur end
|
|
}
|
|
--
|
|
2.24.0.rc1
|
|
|