Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +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:
PaperMC/Paper@b327e17 Fix regenerate chunk method
PaperMC/Paper@22ac7d6 Add internal netty pipeline events
PaperMC/Paper@345a6a6 Updated Upstream (CraftBukkit)
PaperMC/Paper@86f87ba Fix custom merchant trade event world reference
This commit is contained in:
BillyGalbreath
2022-07-27 03:22:54 -05:00
parent a247b93571
commit 85f63e5df0
17 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0212-Add-compass-command.patch
View File

@@ -17,10 +17,10 @@ index 2fbb65c685ac88c77d54f27a5981a132fb44e370..d0ca327337206a64609c1b6ee652cf99
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 cc2b8be3eb4f51075784816a7696d2dca9ae6bea..b95685e13130a214165acccbe287c249ca73f1bf 100644
index edfcb6f0b500867899ee1323b8b9f971cf803bdc..07f024636a8bf096c1922d18548263c778534bd4 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -263,6 +263,7 @@ public class ServerPlayer extends Player {
@@ -264,6 +264,7 @@ public class ServerPlayer extends Player {
public boolean purpurClient = false; // Purpur
public boolean acceptingResourcePack = false; // Purpur
private boolean tpsBar = false; // Purpur
@@ -28,7 +28,7 @@ index cc2b8be3eb4f51075784816a7696d2dca9ae6bea..b95685e13130a214165acccbe287c249
public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
@@ -485,6 +486,7 @@ public class ServerPlayer extends Player {
@@ -486,6 +487,7 @@ public class ServerPlayer extends Player {
}
if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur
@@ -36,7 +36,7 @@ index cc2b8be3eb4f51075784816a7696d2dca9ae6bea..b95685e13130a214165acccbe287c249
}
@Override
@@ -546,6 +548,7 @@ public class ServerPlayer extends Player {
@@ -547,6 +549,7 @@ public class ServerPlayer extends Player {
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
@@ -44,7 +44,7 @@ index cc2b8be3eb4f51075784816a7696d2dca9ae6bea..b95685e13130a214165acccbe287c249
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2631,5 +2634,13 @@ public class ServerPlayer extends Player {
@@ -2632,5 +2635,13 @@ public class ServerPlayer extends Player {
public void tpsBar(boolean tpsBar) {
this.tpsBar = tpsBar;
}