Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01: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:
PaperMC/Paper@8bc0574 Bump kyori's ansi to fix color bleed (#9346)
PaperMC/Paper@f7b386d Use ANSI serializer for console completion descriptions (#9351)
PaperMC/Paper@41e6f20 Updated Upstream (Bukkit/CraftBukkit) (#9342)
PaperMC/Paper@b134eb4 Fix incorrect annotation on BrushableBlock#getItem (#9345)
PaperMC/Paper@fa674f3 Don't enforce icanhasbukkit default if alias block exists (#9334)
PaperMC/Paper@81834ac Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@f6139de Fix sniffer removeExploredLocation and javadoc (#9311)
PaperMC/Paper@17966dd Update the server logo (#9264)
PaperMC/Paper@02e3b5a chore(api): add missing javadoc urls (#9355)
PaperMC/Paper@3f237e8 Fix IntegerUtil#getDivisorNumbers
PaperMC/Paper@f555138 Make sure to post process chunks before they are sent to players
PaperMC/Paper@a226f44 Copy itemstack when sanitizing for datawatcher items
PaperMC/Paper@3885666 Remove stacktrace on exception from reading server.properties (#9296)
This commit is contained in:
Ben Kerllenevich
2023-06-17 09:33:51 -04:00
parent 2e5dcc63d3
commit fa3166a24d
23 changed files with 388 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0060-Add-5-second-tps-average-in-tps.patch
View File

@@ -27,7 +27,7 @@ index fa56cd09102a89692b42f1d14257990508c5c720..f9251183df72ddc56662fd3f02acf216
setListData(vector);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 82cd8c65268838f0bad3b15a8a228fb5b9a30b07..e187ca5cfb1a99ca3e8c25f9a89d4b12b66ab5cd 100644
index 9c803f615cc78c7512125e42f74f25e577ff3606..f9d0c8da7d9a9756879f69b7dd04b635f97fe289 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -303,7 +303,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -69,10 +69,10 @@ index 82cd8c65268838f0bad3b15a8a228fb5b9a30b07..e187ca5cfb1a99ca3e8c25f9a89d4b12
lagging = recentTps[0] < org.purpurmc.purpur.PurpurConfig.laggingThreshold; // Purpur
tickSection = curTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1f04aaf7fc459f5c8aea5ade4120328b3e8a90d3..08df637e9d8f08c14392b2dd61240cd4f1a48f76 100644
index 63a1f7f657d86860be2ee3619998d80e9e3b9236..8a5a3c1754b65c38be5fbbd34cc52942d38df70a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2738,6 +2738,7 @@ public final class CraftServer implements Server {
@@ -2742,6 +2742,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {