mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 00:47:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly Paper Changes: 34e5942b Fix timings task name generation for extreme cases - Fixes #3499 5e3bacbc Ensure ThreadDeath propagates fully - Fixes #3521 9fa6ba26 Optimize Light Engine dfd3848e Use seed based lookup for Treasure Maps - Fixes lag from carto/sunken maps 74dcb3c9 Revert "Fix enchantment costs (#3519)" 6d72ea16 Fix enchantment costs (#3519) 68cc8d79 Maps shouldn't load chunks (#3518) e7cf34a0 Fix villager trading demand MC-163962 (#3498) 51f9edf2 Change name and id to get from profile in AsyncPlayerPreLoginEvent (#3511)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 27637e65736ed89d854c2693de7352528be84b84 Mon Sep 17 00:00:00 2001
|
||||
From 6f7af599f58e6e8229762aef1275a249201fd748 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Tue, 23 Jul 2019 10:07:16 -0500
|
||||
Subject: [PATCH] Implement lagging threshold
|
||||
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement lagging threshold
|
||||
3 files changed, 14 insertions(+)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index d9407aedbf..5baeb156e1 100644
|
||||
index 1d22c2044d..1b2bbb3460 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -184,6 +184,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
||||
@@ -21,7 +21,7 @@ index d9407aedbf..5baeb156e1 100644
|
||||
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
|
||||
// Spigot end
|
||||
|
||||
@@ -944,6 +945,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
||||
@@ -951,6 +952,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
||||
recentTps[1] = tps5.getAverage();
|
||||
recentTps[2] = tps15.getAverage();
|
||||
// Paper end
|
||||
@@ -62,5 +62,5 @@ index 64f1190b03..e890a1f815 100644
|
||||
+ // Purpur end
|
||||
}
|
||||
--
|
||||
2.24.0
|
||||
2.26.2
|
||||
|
||||
|
||||
Reference in New Issue
Block a user