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

@@ -9,10 +9,10 @@ creating an itemstack using the TileEntity's NBT data (how it handles it for
creative players) instead of routing it through the LootableBuilder.
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
index 9564cfd3ff593662cf5755ae1d83dee4b627cdf9..49335b4fc2a9caab1418531a814210bf52b3cc43 100644
index 037515e1821098fd44cf6ad42986aec061546fb6..6b186a49957e97a60bb245912211d58eb7b84c0d 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
@@ -420,7 +420,7 @@ public class ServerPlayerGameMode {
@@ -428,7 +428,7 @@ public class ServerPlayerGameMode {
ItemStack mainHandStack = null; // Paper
boolean isCorrectTool = false; // Paper
@@ -35,7 +35,7 @@ index c89978ecbc5a13dda6f76ea6d1cc3056efc9a174..39868ad3ee4bb573a4dd562894d93f64
blockEntity.saveToItem(itemStack);
if (shulkerBoxBlockEntity.hasCustomName()) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 5ca1f9923ecd232c14a8843963cd20166b10d6b1..13a1373355d613bb6a1aa29a7b4cd3e1fe124dd2 100644
index ce662f1c7ca96586f3470397392576debefa8dcb..2c3c4df0928ee80fe4e6b8152eee46a18231000c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -678,6 +678,11 @@ public class PurpurWorldConfig {