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

@@ -17,10 +17,10 @@ index 0b3a06027f2c600960cd88159803be187c4d0317..533a348acb53c8e7590f3d81c19e53a6
// Paper end
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index ff02dc1687ca079b1798bf8f21ee6af425c42ef4..8f01bc6a58c35cc8be77413174b055a8d707290d 100644
index d7550ce8236b87f89d8d479ced0fc1550179230a..6fb889015ba1a1a7fa5ed54f8a202e2cc5e879a1 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1005,6 +1005,7 @@ public class ServerPlayer extends Player {
@@ -1006,6 +1006,7 @@ public class ServerPlayer extends Player {
}));
Team scoreboardteambase = this.getTeam();