Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Final 1.17 Upstream Update (Paper)

Browse Source 
PaperMC/Paper@4d6073f Partially fix #6880 (#6888)
PaperMC/Paper@f8992ee Extend Entity by Sound.Emitter (#6890)
PaperMC/Paper@db0bff9 Call onRemove logic for breakNaturally (#6854)
PaperMC/Paper@72b731b Updated Upstream (CraftBukkit) (#6885)
PaperMC/Paper@555f99d cleanup: Add hand to bucket events patch (#6881)
PaperMC/Paper@51b7b60 Add API for resetting a single score (#6873)
PaperMC/Paper@f3830bc Update paperweight to 1.2.0 (#6901)
PaperMC/Paper@e22a1a9 Fix more namespacedkey parsing (#6903)
PaperMC/Paper@284b3b8 Fix AnvilPrepareEvent not working with zero xp (#6895)
PaperMC/Paper@22aaf91 Add config option to enable hopper occluding blocks (#6896)
This commit is contained in:
Ben Kerllenevich
2021-11-23 08:10:26 -05:00
parent 7037004849
commit 9beb23b8c3
18 changed files with 63 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0069-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 c287e069e325ab61f251494150059ef982577d00..67543c4a191c81e322391d36e2f51341767e9b03 100644
index f2cd42fd61421f72a8e3104719408e33e3c72d28..0d516ab3e0bd6996330f313635d06b213ffd4aab 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -305,7 +305,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -39,7 +39,7 @@ index c287e069e325ab61f251494150059ef982577d00..67543c4a191c81e322391d36e2f51341
public boolean lagging = false; // Purpur
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
// Spigot end
@@ -1166,6 +1166,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1168,6 +1168,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
private long lastTick = 0;
private long catchupTime = 0;
@@ -47,7 +47,7 @@ index c287e069e325ab61f251494150059ef982577d00..67543c4a191c81e322391d36e2f51341
public final RollingAverage tps1 = new RollingAverage(60);
public final RollingAverage tps5 = new RollingAverage(60 * 5);
public final RollingAverage tps15 = new RollingAverage(60 * 15);
@@ -1256,13 +1257,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1258,13 +1259,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
{
final long diff = curTime - tickSection;
java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);