Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
85ffdc4389 Updated Upstream (CraftBukkit)
f6a1cb21c5 Do not process entity loads in CraftChunk#getEntities (Fixes #6543)
5c7da5536b Prevent an infinite recursion error while rendering translatables (Fixes #6551) (#6555)
cc6fd371b2 Remove "Auto fix bad Y levels on player login" patch
3562558d62 Prevent softlocked end exit portal generation (#6525)
6fa1983e9c Use BlockPost#atY in end portal softlock fix
This commit is contained in:
William Blake Galbreath
2021-09-03 14:52:24 -05:00
parent a36c370c62
commit 8250199f2b
15 changed files with 40 additions and 40 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 cefbdb8f5892d5d46ca6ddc8aa6710be42c189a6..4a201004d397cf960822259d4f7d19cf53d28cf7 100644
index 33543cb967d3e90e3f8269c6e6c8c024b9a0e1ee..64c5a9900121ee5c369affa723de2c5f3433bc29 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1144,6 +1144,7 @@ public class ServerPlayer extends Player {
@@ -1143,6 +1143,7 @@ public class ServerPlayer extends Player {
playerlist.sendPlayerPermissionLevel(this);
worldserver1.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
this.unsetRemoved();