Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@ff251e4 Use reference hash set in reference Holder (#11363)
PaperMC/Paper@691d452 Fix bundled spark permission check (#11355)
PaperMC/Paper@012c527 Update Velocity natives (#11347)
PaperMC/Paper@953e6e9 Fire BlockExpEvent on grindstone use (#11346)
PaperMC/Paper@10f5879 Change condition check order of entity tracking Y (#11348)
PaperMC/Paper@805a974 Improve console completion with brig suggestions (#9251)
PaperMC/Paper@e0021b1 Fix allowSpiderWorldBorderClimbing world config (#11321)
PaperMC/Paper@3db4758 Check dead flag in isAlive() (#11330)
This commit is contained in:
granny
2024-09-06 20:31:46 -07:00
parent a43711d9b0
commit 0a9941ee39
6 changed files with 31 additions and 26 deletions

View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Grindstone API
diff --git a/src/main/java/org/purpurmc/purpur/event/inventory/GrindstoneTakeResultEvent.java b/src/main/java/org/purpurmc/purpur/event/inventory/GrindstoneTakeResultEvent.java
new file mode 100644
index 0000000000000000000000000000000000000000..eebb5d124456b8209d1b8e8cc4cb772dd3714f04
index 0000000000000000000000000000000000000000..d4ccbce1dc8817dcc97c7cdce65d099b6c16b0c8
--- /dev/null
+++ b/src/main/java/org/purpurmc/purpur/event/inventory/GrindstoneTakeResultEvent.java
@@ -0,0 +1,72 @@
@@ -0,0 +1,74 @@
+package org.purpurmc.purpur.event.inventory;
+
+import org.bukkit.entity.HumanEntity;
@@ -55,6 +55,7 @@ index 0000000000000000000000000000000000000000..eebb5d124456b8209d1b8e8cc4cb772d
+
+ /**
+ * Get the amount of experience this transaction will give
+ * (takes priority over and uses result from {@link org.bukkit.event.block.BlockExpEvent})
+ *
+ * @return Amount of experience to give
+ */
@@ -64,6 +65,7 @@ index 0000000000000000000000000000000000000000..eebb5d124456b8209d1b8e8cc4cb772d
+
+ /**
+ * Set the amount of experience this transaction will give
+ * (takes priority over {@link org.bukkit.event.block.BlockExpEvent})
+ *
+ * @param experienceAmount Amount of experience to give
+ */