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

Updated Upstream (Paper & Airplane)

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

Paper Changes:
06db5d08b0 Updated Upstream (Bukkit/CraftBukkit) (#6589)
810d200bb4 Improve interact distance check (#6591)

Airplane Changes:
8207533bdf Upstream
This commit is contained in:
William Blake Galbreath
2021-09-12 22:23:58 -05:00
parent acf2f845e4
commit 8bd08ceeea
53 changed files with 239 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0071-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 446e34941997b3c779fadf7322afe11c1da63360..5f1f6c43a155956298ac57acf54773728cb1215b 100644
index db74d4db83d537beb8a404ac58843b124b1dc496..9592e3c54da1fddd5a9c199c210f9d2780da1f1d 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
@@ -69,10 +69,10 @@ index 446e34941997b3c779fadf7322afe11c1da63360..5f1f6c43a155956298ac57acf5477372
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 0acb9a7b892d36a99dec82df25229deea1b3c35b..34a2ca46b6a049c744e63e443beddf2d238da2ce 100644
index 09530a0caa8c64f27a6fa28c3919fb326e4a31d6..3f750733d8e9a28603166d36eeef390b91ec0837 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2475,6 +2475,7 @@ public final class CraftServer implements Server {
@@ -2471,6 +2471,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {