mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 17:37:42 +01:00
Drop Tident#getItemStack() patch in favor of Paper's new Arrow#getItemStack() patch
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From d75ef0f458af02fc39ab9fdd3cf6d58f1db2a18b Mon Sep 17 00:00:00 2001
|
||||
From db2a7cb27f0b3422bfd8f786c8eb23ad55fc198c Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Fri, 18 Oct 2019 22:50:05 -0500
|
||||
Subject: [PATCH] Add more llama API
|
||||
@@ -1,32 +0,0 @@
|
||||
From b10537f51f8d4f030942dea51aa502c6d6aaa5ef 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.26.2
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From f1460ea4bcb96dc7d46bc6d9792953cb0cd6edc9 Mon Sep 17 00:00:00 2001
|
||||
From f6443249943ce18e3d4b7379852b7aadf34262a7 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 19 Oct 2019 00:28:53 -0500
|
||||
Subject: [PATCH] Add more evoker API
|
||||
@@ -1,4 +1,4 @@
|
||||
From dd653eeabfaf9d9f215bc3698a271fa4dead52ff Mon Sep 17 00:00:00 2001
|
||||
From 3474b0cb95240f60a13d4c4fc4d7d2ecdcf95620 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 19 Oct 2019 00:34:36 -0500
|
||||
Subject: [PATCH] Add getPlacementBlockData to World
|
||||
@@ -1,4 +1,4 @@
|
||||
From 4f79e986c51d57b1174dcb9a31e3160c12ce6f16 Mon Sep 17 00:00:00 2001
|
||||
From 6172f928c68e5721317cacb90c6d32e5c45239f4 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 19 Oct 2019 02:25:05 -0500
|
||||
Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
|
||||
@@ -1,4 +1,4 @@
|
||||
From de027d01bb94d9a600a8137ecbb99bf13a86ce1e Mon Sep 17 00:00:00 2001
|
||||
From 1f20a2388d7c234a15f667c52eb11e1e2e89153e Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 19 Oct 2019 02:35:24 -0500
|
||||
Subject: [PATCH] Add getPlayer to SkeletonHorseTrapEvent
|
||||
@@ -1,4 +1,4 @@
|
||||
From 36b168a9396d76dc6db8cbbf72597dd8bc6eb461 Mon Sep 17 00:00:00 2001
|
||||
From f6f1059eb70c8286fafd421d629652abddeab72a Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 19 Oct 2019 02:43:10 -0500
|
||||
Subject: [PATCH] Add LootableInventoryFirstFillEvent
|
||||
@@ -1,4 +1,4 @@
|
||||
From 8eb94328a7cc4e037d4cb02d747e278f456e2d64 Mon Sep 17 00:00:00 2001
|
||||
From b08452c2c1e0893a931b924f80972baa4d007619 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 19 Oct 2019 03:53:46 -0500
|
||||
Subject: [PATCH] Add back EntityCreatePortalEvent for EnderDragon
|
||||
@@ -1,4 +1,4 @@
|
||||
From 836041611bf7c8384dbc7234ad9c2f14a572561a Mon Sep 17 00:00:00 2001
|
||||
From ed866cae2228a4924e2ddba5b9f0377170d9555f Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Tue, 11 Feb 2020 21:56:38 -0600
|
||||
Subject: [PATCH] Implement EntityMoveEvent
|
||||
@@ -1,4 +1,4 @@
|
||||
From d1a2366614a9a590a5dc8472d257294e75143af5 Mon Sep 17 00:00:00 2001
|
||||
From 28d6279d8881deed20cc24abfecddfcffefb94c2 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sun, 15 Mar 2020 20:52:12 -0500
|
||||
Subject: [PATCH] Add ItemStack convenience methods
|
||||
@@ -1,4 +1,4 @@
|
||||
From 015d95baa403e56a5b9f9c27fd3fa09817a25cfc Mon Sep 17 00:00:00 2001
|
||||
From 5b7ad2395e52a542256545223baee7b6f57e0adf Mon Sep 17 00:00:00 2001
|
||||
From: Eearslya Sleiarion <eearslya@gmail.com>
|
||||
Date: Mon, 24 Jun 2019 21:27:39 -0700
|
||||
Subject: [PATCH] Add BellRingEvent
|
||||
@@ -1,4 +1,4 @@
|
||||
From 28922f0b553d8b6c279808253b46ea87b7f02f70 Mon Sep 17 00:00:00 2001
|
||||
From eb6271ac09f62253e19664c2a5e4b28f1dd5a914 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Wed, 1 Apr 2020 19:18:29 -0500
|
||||
Subject: [PATCH] Configurable enchantment max level
|
||||
@@ -1,4 +1,4 @@
|
||||
From 9171a6d0bed6ece643c54618dec8c98a80b8bd9b Mon Sep 17 00:00:00 2001
|
||||
From 3121b0887bf03835c9b9a6f1fd3fd2775af5681f Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sun, 19 Apr 2020 00:25:09 -0500
|
||||
Subject: [PATCH] More anvil controls
|
||||
@@ -1,4 +1,4 @@
|
||||
From ab076fda79e34461e2877a473ecbde07c5f6eebb Mon Sep 17 00:00:00 2001
|
||||
From b5e2f3328828a98fa1521fe61725cddd2d104590 Mon Sep 17 00:00:00 2001
|
||||
From: KennyTV <kennytv@t-online.de>
|
||||
Date: Mon, 20 Apr 2020 13:57:13 +0200
|
||||
Subject: [PATCH] PlayerItemCooldownEvent
|
||||
@@ -1,4 +1,4 @@
|
||||
From 476e11ba739b06424b4e344f77e4eabd1afad412 Mon Sep 17 00:00:00 2001
|
||||
From 02ff3b3a31c89fa3c48f228b8637803d919d0c9c Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sat, 2 May 2020 20:55:31 -0500
|
||||
Subject: [PATCH] Player invulnerabilities
|
||||
@@ -1,4 +1,4 @@
|
||||
From 3ecd78a2fc6828c6ae662179c82a2948593640c9 Mon Sep 17 00:00:00 2001
|
||||
From 520632fdade49977988e20c07bd90d360f86418a Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Thu, 18 Jun 2020 23:29:43 -0500
|
||||
Subject: [PATCH] Add PrepareGrindstoneEvent
|
||||
Reference in New Issue
Block a user