Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge in Tuinity patches

Browse Source
This commit is contained in:
William Blake Galbreath
2020-03-08 12:49:59 -05:00
parent c8a65b216f
commit a32448bda1
140 changed files with 11159 additions and 1947 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
patches/server/0082-Expose-getItemStack-for-Trident.patch Normal file
View File

@@ -0,0 +1,42 @@
From 12117c208b9ec2c41ac6d51f00e5d74bd2ad94a8 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 59bb039ad..ed8e26aa4 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 0518e6c68..63287a9b6 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