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)

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

Paper Changes:
90264712a [Auto] Updated Upstream (Bukkit)
960d992fd Further improve Chunk Light Prioritization
0d19e4579 Fix deadlock issue with watchdog stopping
baf1fabe9 Updated Upstream (CraftBukkit)
c0547a6cb [CI-SKIP] Revitalise CONTRIBUTING.md
This commit is contained in:
William Blake Galbreath
2020-07-29 07:43:30 -05:00
parent fe05292d11
commit 0a4aaf4966
8 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0014-Lagging-threshold.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 47b453899..3e9cbafc8 100644
index 99b6666a85..14ca25adae 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -166,6 +166,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -16,7 +16,7 @@ index 47b453899..3e9cbafc8 100644
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
// Spigot end
@@ -984,6 +985,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -985,6 +986,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
recentTps[1] = tps5.getAverage();
recentTps[2] = tps15.getAverage();
// Paper end
@@ -25,7 +25,7 @@ index 47b453899..3e9cbafc8 100644
}
// Tuinity - replace logic
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 27cbfdfba..6ff5e0783 100644
index 27cbfdfba8..6ff5e07834 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -149,6 +149,11 @@ public class PurpurConfig {
@@ -41,7 +41,7 @@ index 27cbfdfba..6ff5e0783 100644
public static boolean enderChestSixRows = false;
public static boolean enderChestPermissionRows = false;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 57a34fb96..233f4fb8c 100644
index 57a34fb969..233f4fb8cc 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2409,5 +2409,10 @@ public final class CraftServer implements Server {