Merge in Tuinity patches

patches/api/0023-Expose-getItemStack-for-Trident.patch

@@ -0,0 +1,32 @@
+From b51632e4cebc06f041b40c0612164edc4eccaaf6 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.24.0
+