Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0141-Implement-TPSBar.patch
View File

@@ -42,7 +42,7 @@ index ef0d4086af9a05bf5f0dd1eae965e496b1de6199..c7db9d6357935c6004867ded2b422f8a
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index a78d1068802c98d888fe2e139a327a089a2b2bf8..cefbdb8f5892d5d46ca6ddc8aa6710be42c189a6 100644
index 708544ba328bab7a5eb9f4860eccb32258c6ee04..33543cb967d3e90e3f8269c6e6c8c024b9a0e1ee 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -260,6 +260,7 @@ public class ServerPlayer extends Player {
@@ -53,7 +53,7 @@ index a78d1068802c98d888fe2e139a327a089a2b2bf8..cefbdb8f5892d5d46ca6ddc8aa6710be
public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
@@ -482,6 +483,7 @@ public class ServerPlayer extends Player {
@@ -481,6 +482,7 @@ public class ServerPlayer extends Player {
}
}
@@ -61,7 +61,7 @@ index a78d1068802c98d888fe2e139a327a089a2b2bf8..cefbdb8f5892d5d46ca6ddc8aa6710be
}
@Override
@@ -542,6 +544,7 @@ public class ServerPlayer extends Player {
@@ -541,6 +543,7 @@ public class ServerPlayer extends Player {
}
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
@@ -69,7 +69,7 @@ index a78d1068802c98d888fe2e139a327a089a2b2bf8..cefbdb8f5892d5d46ca6ddc8aa6710be
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2550,5 +2553,13 @@ public class ServerPlayer extends Player {
@@ -2549,5 +2552,13 @@ public class ServerPlayer extends Player {
this.server.getPlayerList().moveToWorld(this, toLevel, true, to, !toLevel.paperConfig.disableTeleportationSuffocationCheck);
}
}
@@ -105,7 +105,7 @@ index e17c61e3b807dbc1a7bca4952349145617204154..cf016f139895690d5a0e0ef2709e31ea
entityplayer.awardStat(Stats.LEAVE_GAME);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 8323b10a6ab17f56c6e5d1ad2cee9ebc7ad403de..e4e5b2cef7bcbb4e9411f78aefbdf2486e1658e8 100644
index 9494d94abbe352d275ed39070dbc59d8650a0ed7..16a7808f0ad010240db8a33eccc61b623ccd3d76 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -209,6 +209,29 @@ public class PurpurConfig {