mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 09:27:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@46a9d2a Cache Component MOTDs
This commit is contained in:
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable TPS Catchup
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index 55ba57bef13dfd22ceecc660391423767f2826d5..316fbcc26137ad6ef03eb9a535cff93eb2faa551 100644
|
||||
index a37e28ebef82d4964899f1331b9a1b6d992b167f..3eef0ceb4c9c1506581c0e4f197f137045329166 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -1191,7 +1191,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||
@@ -1192,7 +1192,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||
this.tickServer(this::haveTime);
|
||||
this.profiler.popPush("nextTickWait");
|
||||
this.mayHaveDelayedTasks = true;
|
||||
@@ -24,7 +24,7 @@ index 55ba57bef13dfd22ceecc660391423767f2826d5..316fbcc26137ad6ef03eb9a535cff93e
|
||||
this.profiler.pop();
|
||||
this.endMetricsRecordingTick();
|
||||
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||
index dab104575c5a12857faffb8efc5620a123580a9e..b41d73318d6795c0fa7b9c60431ef141026fa9d6 100644
|
||||
index 918eee23167fb9b39bd19ba1a6d8776f83d56ea2..75570f6de691fb5dc95dd31d2255f3913a7100dd 100644
|
||||
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||
@@ -241,4 +241,9 @@ public class PurpurConfig {
|
||||
|
||||
Reference in New Issue
Block a user