Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-06-23 10:47:47 +02: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@f53a8042 drop previous block from sulfur cube after swap
PaperMC/Paper@37d9857b Call ExplosionPrimeEvent / EntityUnleashEvent for Sulfur Cube (#13935)
PaperMC/Paper@58cfde23 make sulfur cube ageable
PaperMC/Paper@a4e7b2f6 fix abi break for blockdata
PaperMC/Paper@3a05566b improve damage cause heuristics
PaperMC/Paper@3ec423fb Call EntityDamageByEntityEvent for SulfurCube's contact damage (#13937)
PaperMC/Paper@2c1ecaec merge hot floor and campfire damage cause to contact
PaperMC/Paper@273c92d8 support markdown javadoc in generator
This commit is contained in:
granny
2026-06-06 22:59:52 -07:00
parent a857d511b9
commit da23f92836
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java.patch
View File

@@ -1,6 +1,6 @@
--- a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
+++ b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
@@ -60,7 +_,7 @@
@@ -61,7 +_,7 @@
Vector<String> vector = new Vector<>();
// Follows CraftServer#getTPS
@@ -8,11 +8,11 @@
+ double[] tps = server.getTPS(); // Purpur - diff on change
String[] tpsAvg = new String[tps.length];
for ( int g = 0; g < tps.length; g++) {
@@ -69,7 +_,7 @@
for (int g = 0; g < tps.length; g++) {
@@ -70,7 +_,7 @@
vector.add("Memory use: " + (data.getUsedMem() / 1024L / 1024L) + " mb (" + (data.getFree() * 100L / data.getMax()) + "% free)");
vector.add("Heap: " + (data.getTotal() / 1024L / 1024L) + " / " + (data.getMax() / 1024L / 1024L) + " mb");
vector.add("Avg tick: " + DECIMAL_FORMAT.format((double)this.server.getAverageTickTimeNanos() / (double) TimeUtil.NANOSECONDS_PER_MILLISECOND) + " ms");
vector.add("Avg tick: " + DECIMAL_FORMAT.format((double) this.server.getAverageTickTimeNanos() / (double) TimeUtil.NANOSECONDS_PER_MILLISECOND) + " ms");
- vector.add("TPS from last 1m, 5m, 15m: " + String.join(", ", tpsAvg));
+ vector.add("TPS from last 5s, 1m, 5m, 15m: " + String.join(", ", tpsAvg)); // Purpur - Add 5 second tps average in /tps
setListData(vector);