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

@@ -46,10 +46,10 @@ index d743d50a9b3ad9502fc11adc6fe43e9a58d7a94b..372eea42755cad6bf957fa94b816db25
return new Throwable(entity + " Added to world at " + new java.util.Date());
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 3becbc139ea6510ecc7e6e160620b8fa3b66dc46..6ea2657daf537a0aa75aa5e5c03fca9610c01f7e 100644
index 4d54d474f7d5cc4b3e1530876aa18b916ce4f72c..d2d2e3c58bd3d08f4e7f6257502ce8c2bca19825 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -665,6 +665,15 @@ public class ServerPlayer extends Player {
@@ -664,6 +664,15 @@ public class ServerPlayer extends Player {
}
this.advancements.flushDirty(this);
@@ -65,7 +65,7 @@ index 3becbc139ea6510ecc7e6e160620b8fa3b66dc46..6ea2657daf537a0aa75aa5e5c03fca96
}
public void doTick() {
@@ -2441,4 +2450,6 @@ public class ServerPlayer extends Player {
@@ -2440,4 +2449,6 @@ public class ServerPlayer extends Player {
return (CraftPlayer) super.getBukkitEntity();
}
// CraftBukkit end