Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47:42 +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

8
patches/server/0234-Add-compass-command.patch
View File

@@ -17,7 +17,7 @@ index 48a70900082c6c2c99c955a6ac40b48859a74979..8c2424b0917d278bb0b9e687d116d8de
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index d4b9a31fb3a26a8939e1d30f5b6bc2d66fc7620a..6d0257c35081991e925d85348aff168c6ca58ad7 100644
index b599607d616f9faf209f1a4491dd3fcfd49a6126..0cb58f2a5607664193adddbfd7e43384c5a44862 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -261,6 +261,7 @@ public class ServerPlayer extends Player {
@@ -28,7 +28,7 @@ index d4b9a31fb3a26a8939e1d30f5b6bc2d66fc7620a..6d0257c35081991e925d85348aff168c
public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
@@ -484,6 +485,7 @@ public class ServerPlayer extends Player {
@@ -483,6 +484,7 @@ public class ServerPlayer extends Player {
}
if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur
@@ -36,7 +36,7 @@ index d4b9a31fb3a26a8939e1d30f5b6bc2d66fc7620a..6d0257c35081991e925d85348aff168c
}
@Override
@@ -545,6 +547,7 @@ public class ServerPlayer extends Player {
@@ -544,6 +546,7 @@ public class ServerPlayer extends Player {
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
@@ -44,7 +44,7 @@ index d4b9a31fb3a26a8939e1d30f5b6bc2d66fc7620a..6d0257c35081991e925d85348aff168c
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2563,5 +2566,13 @@ public class ServerPlayer extends Player {
@@ -2562,5 +2565,13 @@ public class ServerPlayer extends Player {
public void tpsBar(boolean tpsBar) {
this.tpsBar = tpsBar;
}