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

Updated Upstream (Paper, Tuinity, & Airplane)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
3dcbdc73b Fix force upgrade patch (#5699)
dab6ec6cd List all missing hard depends not just first (#5673)
aed5031e3 Fix/Optimize world and light datafixes (#5693)
719040d92 [Auto] Updated Upstream (CraftBukkit)
6c183f1ae [Auto] Updated Upstream (CraftBukkit)

Tuinity Changes:
f88659c8e Fix and optimise world force upgrading

Airplane Changes:
7f3b09178 Move check
040fa19eb Better checking for useless move packets
5fab6a257 Improvements to fluid & profiler patches
046ae543c Improve hopper performance via bitset
4a221843f Update Upstream (Tuinity)
This commit is contained in:
BillyGalbreath
2021-05-21 04:25:41 -05:00
parent 1808888a40
commit af2dd61af0
25 changed files with 735 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0074-Add-5-second-tps-average-in-tps.patch
View File

@@ -27,7 +27,7 @@ index dc6bc1910ad0f9b27144d5750078c3ca607d03d3..e8be35f836ede2630d44902e99a21489
setListData(vector);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 11e69678c04017faa66a7527e892c5db73cf235b..b268068b5d2bc5f0d032e11ac38bf011a32df01c 100644
index ac21ebf5d835fb34dbaad5f3c40cc5aeb6153231..cbc6d074a7366f6456c6af2a3fedf0f7bd40cb5b 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -279,7 +279,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -39,7 +39,7 @@ index 11e69678c04017faa66a7527e892c5db73cf235b..b268068b5d2bc5f0d032e11ac38bf011
public boolean lagging = false; // Purpur
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
// Spigot end
@@ -1016,6 +1016,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1018,6 +1018,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
private long lastTick = 0;
private long catchupTime = 0;
@@ -47,7 +47,7 @@ index 11e69678c04017faa66a7527e892c5db73cf235b..b268068b5d2bc5f0d032e11ac38bf011
public final RollingAverage tps1 = new RollingAverage(60);
public final RollingAverage tps5 = new RollingAverage(60 * 5);
public final RollingAverage tps15 = new RollingAverage(60 * 15);
@@ -1108,13 +1109,17 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1110,13 +1111,17 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
{
final long diff = curTime - tickSection;
java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);
@@ -69,10 +69,10 @@ index 11e69678c04017faa66a7527e892c5db73cf235b..b268068b5d2bc5f0d032e11ac38bf011
lagging = recentTps[0] < net.pl3x.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 b435abc54cac0bc79fbefa30ac2d7d8fc8a2a996..12282aaea7b1dce8f958914e41137b17544a159e 100644
index d46e5819bd0bc6ac16b536ee3abe5a0142995bf3..af3c01156a9a5f6f08fff9db67c9c089a321cb29 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2333,6 +2333,7 @@ public final class CraftServer implements Server {
@@ -2334,6 +2334,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {