Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@adb4fb4 [ci skip] update mappings link (#9801)
PaperMC/Paper@a702a08 Move clientBrandName over to ServerPlayer (#9809)
This commit is contained in:
granny
2023-10-08 23:21:21 -07:00
parent be959650a5
commit 69d6fae064
19 changed files with 61 additions and 102 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 14fcc48f24dec99f966d629d78910725b4a99adc..69a1aaa1cf575325bc383921aee6e6e0d7da6057 100644
index 97fcc122278c5b0f88e7f18eeb601a75753ae209..dd83aa83e8d4da4d16e9731f8527cd0f470848e0 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1108,7 +1108,16 @@ public class ServerPlayer extends Player {
@@ -1109,7 +1109,16 @@ public class ServerPlayer extends Player {
if (this.isInvulnerableTo(source)) {
return false;
} else {