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@41ab602 [ci skip] couple more fixes for build pr jar label (#8599)
PaperMC/Paper@c40f8d5 Sync offhand slot in menus (#7341)
PaperMC/Paper@425baed Fully deserialise persistent anger post async load (#8560)
PaperMC/Paper@ec6a9a3 Updated Upstream (Bukkit/CraftBukkit) (#8604)
PaperMC/Paper@96fdafd Player Entity Tracking Events (#4722)
PaperMC/Paper@407a445 Fix dumplisteners missing folder creation
PaperMC/Paper@b07d5e0 Limit pet look distance (#8612)
PaperMC/Paper@476ef25 Add missing Fluid type (#8608)
This commit is contained in:
Encode42
2022-12-07 12:05:48 -05:00
parent 86f2da583b
commit 482a83ff9f
21 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement TPSBar
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index ab0f00128f8c1b13c3eb5787df0c4e26372e0734..14b12cb6967c1c2735cf6a0eafdf6e23889a528c 100644
index 756153203a1a1cab7ac46b88d5745cd5bc090438..e5e8f39a63f232b73d74c3350aa74bb5569f21c4 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -210,6 +210,7 @@ public class Commands {
@@ -41,7 +41,7 @@ index 24b7ae3253b0710954d4a522114fc0617c0ef3b3..d24216e1d9dcf8e9b68aabd622881a00
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 8a41c02d645e7d527cc8f25377a756293c5b8436..0f14419dea999f0872224f33208fa89337d066b1 100644
index 0e5d361eb5d42036e660946a1cbd9f1cc4b2930f..43e69bcf6910f06bc70f575376e3c4402bfe6837 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 {
@@ -52,7 +52,7 @@ index 8a41c02d645e7d527cc8f25377a756293c5b8436..0f14419dea999f0872224f33208fa893
public boolean isRealPlayer; // Paper
public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
@@ -489,6 +490,7 @@ public class ServerPlayer extends Player {
@@ -496,6 +497,7 @@ public class ServerPlayer extends Player {
}
}
@@ -60,7 +60,7 @@ index 8a41c02d645e7d527cc8f25377a756293c5b8436..0f14419dea999f0872224f33208fa893
}
@Override
@@ -549,6 +551,7 @@ public class ServerPlayer extends Player {
@@ -556,6 +558,7 @@ public class ServerPlayer extends Player {
}
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
@@ -68,7 +68,7 @@ index 8a41c02d645e7d527cc8f25377a756293c5b8436..0f14419dea999f0872224f33208fa893
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2637,5 +2640,13 @@ public class ServerPlayer extends Player {
@@ -2644,5 +2647,13 @@ public class ServerPlayer extends Player {
this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck);
}
}