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

Updated Upstream (Tuinity)

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

Tuinity Changes:
0fbcf78 Fix small issue with handling of step height in colliding
0ae7e67 Do not load chunks during a crash report
8c5d945 Improve abnormal server shutdown process
cc34294 Copy passenger list in enderTeleportTo
9a48d49 Fix skylight propagation issue on the highest non-empty section border
5d722a0 Fix incorrect handling of special colliding blocks in chunk sections
This commit is contained in:
BillyGalbreath
2020-12-10 22:11:33 -06:00
parent 787e35c340
commit 41f23a7a15
3 changed files with 271 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0080-Add-5-second-tps-average-in-tps.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add 5 second tps average in /tps
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0f9c6b964f..c339c57b07 100644
index 2d01bc9c5..dd1e08328 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -167,7 +167,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -17,7 +17,7 @@ index 0f9c6b964f..c339c57b07 100644
public boolean lagging = false; // Purpur
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
// Spigot end
@@ -885,6 +885,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -886,6 +886,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 0f9c6b964f..c339c57b07 100644
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 4acc9ca619..3dec164f64 100644
index 4acc9ca61..3dec164f6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2238,6 +2238,7 @@ public final class CraftServer implements Server {
@@ -59,7 +59,7 @@ index 4acc9ca619..3dec164f64 100644
net.minecraft.server.MinecraftServer.getServer().tps5.getAverage(),
net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
index 7218f23df4..3c7b9a6d24 100644
index 7218f23df..3c7b9a6d2 100644
--- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
+++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
@@ -33,7 +33,7 @@ public class TicksPerSecondCommand extends Command