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

Updated Upstream (Paper)

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

Paper Changes:
7232d8f2a EntityLoadCrossbowEvent#shouldConsumeItem
4740bd6c8 Mark PlayerInventory#getItem as nullable
bd9ace578 Add a config option to limit the number of entities of each type to load/save in a chunk (#4792)
6bafeb5a9 Move logic from last patch into correct place
9668118fd disable entity ticking flag after watchdog obliteration
This commit is contained in:
jmp
2021-01-14 14:47:12 -08:00
parent 17e9e39370
commit 7f4c8f8715
111 changed files with 47 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0013-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 0945e9cf8a37868beb9ea13e7b889aae827b4662..3ac30bbf7ad327372b02ed365572fd3226fb6f9a 100644
index e537b9720aa2988bf4740fc9c2c9c5c8b09df292..ff6ed0a8e055eaf73249d8c2d0f69a29c2067f61 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -163,6 +163,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -16,7 +16,7 @@ index 0945e9cf8a37868beb9ea13e7b889aae827b4662..3ac30bbf7ad327372b02ed365572fd32
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
// Spigot end
@@ -980,6 +981,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -984,6 +985,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
recentTps[1] = tps5.getAverage();
recentTps[2] = tps15.getAverage();
// Paper end