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

Update to 1.15

Browse Source
This commit is contained in:
William Blake Galbreath
2019-12-13 15:11:37 -06:00
parent af7f8f2bb5
commit 18ebfc0366
88 changed files with 1038 additions and 1068 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,42 @@
From 2c10cc6fa7b50f6954a8a89e13cc897182c811cf 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.rc1