Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@b327e17 Fix regenerate chunk method
PaperMC/Paper@22ac7d6 Add internal netty pipeline events
PaperMC/Paper@345a6a6 Updated Upstream (CraftBukkit)
PaperMC/Paper@86f87ba Fix custom merchant trade event world reference
This commit is contained in:
BillyGalbreath
2022-07-27 03:22:54 -05:00
parent a247b93571
commit 85f63e5df0
17 changed files with 53 additions and 53 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add boat fall damage config
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 63b04bf9fc97554c309b8caac5cb942b9483208d..e9177d815c99450007ddfc9de59cebaa3ae74688 100644
index c8495f6944ae4837ede2c3680f02ecf112106ea6..73a764c56a77e376bbca7ec098092d133cd2c2e0 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1032,7 +1032,16 @@ public class ServerPlayer extends Player {
@@ -1033,7 +1033,16 @@ public class ServerPlayer extends Player {
if (this.isInvulnerableTo(source)) {
return false;
} else {