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

Expose getItemStack for Trident

Browse Source
This commit is contained in:
William Blake Galbreath
2019-10-18 22:19:52 -05:00
parent 7089d296ce
commit 6cffefa194
2 changed files with 74 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
patches/api/0016-Expose-getItemStack-for-Trident.patch Normal file
View File

@@ -0,0 +1,32 @@
From 85b258fecc2923ce02367d8b03857279baa31065 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 18 Oct 2019 22:19:31 -0500
Subject: [PATCH] Expose getItemStack for Trident
---
src/main/java/org/bukkit/entity/Trident.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/bukkit/entity/Trident.java b/src/main/java/org/bukkit/entity/Trident.java
index 3379ef9ba..27f19074e 100644
--- a/src/main/java/org/bukkit/entity/Trident.java
+++ b/src/main/java/org/bukkit/entity/Trident.java
@@ -3,4 +3,14 @@ package org.bukkit.entity;
/**
* Represents a thrown trident.
*/
-public interface Trident extends AbstractArrow { }
+public interface Trident extends AbstractArrow {
+ // Purpur start
+ /**
+ * Gets the trident itemstack that was used to spawn this trident entity
+ *
+ * @return Thrown Trident ItemStack
+ */
+ @org.jetbrains.annotations.NotNull
+ public org.bukkit.inventory.ItemStack getItemStack();
+ // Purpur end
+}
--
2.23.0.rc1

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

@@ -0,0 +1,42 @@
From 4bc1d09fbf1c34beacee789e5bf7fd18e22e3549 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.23.0.rc1