Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@92f872c Fix bad diff in wandering trader spawn rate patch from .4 update
PaperMC/Paper@9087a64 chore: cleanup annotations in api adventure patch
PaperMC/Paper@23b0ef5 [ci skip] rebuild patches
PaperMC/Paper@a0f548f Don't warn for deprecated PrepareGrindstoneEvent (#9036)
PaperMC/Paper@38be4f8 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9018)
PaperMC/Paper@d5abb94 Expose Path to jar file in PluginProviderContext (#9030)
This commit is contained in:
granny
2023-03-26 00:43:10 -07:00
parent fce57a5593
commit d56f66d677
15 changed files with 43 additions and 43 deletions

View File

@@ -223,10 +223,10 @@ index 191e8233deaa859d969d54242e297e722f3d947b..76e26542448d18750ce33d53d54c2a77
case DISPENSER:
case DROPPER:
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
index 44eba9e20651c29a84def786f4a350750fdbdeeb..15b3e89702a6a8dbfcd820ac9654c9c15b95c52f 100644
index 092f6843e3b43d4c615d2eee344f5966e96ae850..cb0c851ab5fcf676da2397040835a94d4bdb4be1 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
@@ -82,7 +82,7 @@ public class CraftInventory implements Inventory {
@@ -83,7 +83,7 @@ public class CraftInventory implements Inventory {
@Override
public void setContents(ItemStack[] items) {