mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 01:17:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly Paper Changes: b75eeca0 Boost light task priority to ensure it doesnt hold up chunk loads 3d2bc848 Ensure VillagerTrades doesn't load async - fixes #3495 e470f1ef Add more information to Timing Reports f4a47db6 Improve Thread Pool usage to allow single threads for single cpu servers a4fe910f Fix sounds when using worldedit regen command 70ad51a8 Updated Upstream (Bukkit/CraftBukkit) d7cfa4fa Improve legacy format serialization more
This commit is contained in:
@@ -1,32 +0,0 @@
|
||||
From 0f7cf240c9626b6026a3d677c27d2f6e6ce25f77 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
|
||||
|
||||
Reference in New Issue
Block a user