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] Fix stuck in portals
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 0a1daa97fc54fbe565de9754594a1fd68ff6652c..5fdd6e2dd19e239ac864f0273f6a2b921c297306 100644
index 9d6733c426c823cfac4da542fd83c5e6832312e1..e009832899cc8e765342fee8718f30562edfcca6 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1267,6 +1267,7 @@ public class ServerPlayer extends Player {
@@ -1268,6 +1268,7 @@ public class ServerPlayer extends Player {
playerlist.sendPlayerPermissionLevel(this);
worldserver1.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
this.unsetRemoved();