Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@0284b27 Add API for waxed signs (#9291)
PaperMC/Paper@dc30ee5 Properly remove the experimental smithing inventory type (#9290)
This commit is contained in:
granny 2023-06-09 20:09:36 -07:00
parent 98986b44f5
commit 6f7b685add
No known key found for this signature in database
2 changed files with 4 additions and 4 deletions

View File

@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.20-R0.1-SNAPSHOT
mcVersion = 1.20
paperCommit = 648c000fb2330ca1f9b7833a275e70f06c1fce83
paperCommit = dc30ee591d52a55ac1f6dfce6e731a583cc21fad
org.gradle.caching = true
org.gradle.parallel = true

View File

@ -198,10 +198,10 @@ index 416aa989ebb18a8741cc9d605a1180ab830f6643..e38a0adf5463c48311ad08b8d2e5b5c2
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
index bdaa739aa18a95894a165e9333a3e9d596fd7dc3..ef999d36a9bc8a22b6f9e1039173e4270804585a 100644
index 3075ba5f6d66316f27e618d8b279252e9520b9cb..299a099ead00069cc275e1dc9a21742abf222d85 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
@@ -180,8 +180,19 @@ public class CraftContainer extends AbstractContainerMenu {
@@ -181,8 +181,19 @@ public class CraftContainer extends AbstractContainerMenu {
case PLAYER:
case CHEST:
case ENDER_CHEST:
@ -223,7 +223,7 @@ index bdaa739aa18a95894a165e9333a3e9d596fd7dc3..ef999d36a9bc8a22b6f9e1039173e427
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 092f6843e3b43d4c615d2eee344f5966e96ae850..cb0c851ab5fcf676da2397040835a94d4bdb4be1 100644
index 10844fecc01370dcd0cc36f83e166bacb48ded30..c5340c2ac5c6771ba5809c3ba0be8f4c2e6a15f7 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
@@ -83,7 +83,7 @@ public class CraftInventory implements Inventory {