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

@@ -5,10 +5,10 @@ Subject: [PATCH] Break individual slabs when sneaking
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
index b69277b2ce0b5e4fd5cc5c21d07f529a16d21cc6..9564cfd3ff593662cf5755ae1d83dee4b627cdf9 100644
index 1a46dbb364423c889fcdf58f640b778487cef7b7..037515e1821098fd44cf6ad42986aec061546fb6 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
@@ -389,6 +389,7 @@ public class ServerPlayerGameMode {
@@ -397,6 +397,7 @@ public class ServerPlayerGameMode {
} else {capturedBlockEntity = true;} // Paper end
return false;
}
@@ -47,7 +47,7 @@ index 18b603d646081926343dea108b55d641df1c2c34..03ad3e45fc6d48091ac0c0ba5dc3d014
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index def330259864bb5d51bd843b512e2162c6b1cbed..36fb15cb1e6e8a177a4006a901a0cb8048a9a242 100644
index 90bea40165a45f06c71a1627ee812cc616df0a52..1687652d528e61ebcba35a2437a0ac5ece7e6ce8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -611,6 +611,11 @@ public class PurpurWorldConfig {