mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 17:07:43 +01:00
193c511fce
Upstream has released updates that appears to apply and compile correctly Paper Changes: a4f066cc Fix method profiler inbalance introduced in a2a9ffe (#3132) c65dcad3 Don't delay chunk unloads during entity ticking bc17ce69 Delay unsafe actions until after entity ticking is done - Fixes #3114 5553e6b3 Disable Sync Events firing Async errors during shutdown e12c51d9 Use better variable for isStopping() API 586ee2bb Remove patch for MC-111480, fixed in 1.14 09a94215 Remove streams from Mob AI System bb5c294e Fix Disabling Asynchronous Chunks 089d8356 Implement Chunk Priority / Urgency System for World Gen fce69af7 Use dedicated thread for main thread blocking chunk loads 588b62e4 Add tick times API and /mspt command (#3102) 11de41c7 Add API MinecraftServer#isStopping (#3129) 942ff3c2 My patches are under MIT (#3130)
43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
From cfd4aa008264358a6f6fc5d7d20ea38201a8c680 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 59bb039ad7..ed8e26aa45 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityThrownTrident.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityThrownTrident.java
|
|
@@ -77,7 +77,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
|
|
|