mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 17:37:42 +01:00
fc7824b3a8
Upstream has released updates that appears to apply and compile correctly Paper Changes: f29c7ebd Improve async login (#3189) 9fd36824 Fix Citizens Player NPC tracking issue - Fixes #3186 0e72de1c Fix Player Tracking issue during join process. f26362af Load Spawn Chunks Asynchronously and Spiral Out 54f762e2 Load Chunks for Login Asynchronously f2d1b6e5 Clean up duplicate PlayerInitialSpawnEvent c2d022d7 Fix Longstanding Broken behavior of PlayerJoinEvent d0a348b9 Broadcast join messages to console 1ef687a4 Don't crash if player is attempted to be removed from untracked chunk. c11668ac Make sure the chunk conversion task is executed immediately 26fb7cc3 Fix Chunk Post Processing deadlock risk
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From 36dab1ca8492e3b84c18556e6a02c0e31dfd10cb Mon Sep 17 00:00:00 2001
|
|
From: Spottedleaf <spottedleaf@spottedleaf.dev>
|
|
Date: Fri, 3 Apr 2020 02:21:13 -0700
|
|
Subject: [PATCH] Tuinity - Always able to execute tasks on the main server
|
|
queue
|
|
|
|
This should move all queued packet execution into the main server
|
|
tick loop, so this will free up some time for oversleep to act on
|
|
chunks.
|
|
---
|
|
src/main/java/net/minecraft/server/MinecraftServer.java | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
index 51fc57100e..1ef742fd6b 100644
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
@@ -1086,7 +1086,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
|
}
|
|
|
|
protected boolean canExecute(TickTask ticktask) {
|
|
- return ticktask.a() + 3 < this.ticks || this.canSleepForTick();
|
|
+ return true; // Purpur - always able to execute tasks
|
|
}
|
|
|
|
@Override
|
|
--
|
|
2.24.0
|
|
|