mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 18:07:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@55475f0 [ci skip] Fix typos PaperMC/Paper@f8e2a67 Check for AbstractBoat instead of Boat in EAR ignore list PaperMC/Paper@8dc42fa Add API to check if the server is sleeping (#11605) PaperMC/Paper@817550c Add API to allow/disallow tick sleeping (#11611) PaperMC/Paper@915637d Run 'freeze' listeners before tag events (#11606) PaperMC/Paper@751e9bd Fix jukebox component (#11642) PaperMC/Paper@f241260 Make TypedKey an actual Key (#11641) PaperMC/Paper@860d948 Support tags for more SimpleRegistry (#11607) PaperMC/Paper@aee6f7a Correctly mirror vanilla non-exact ingredients (#11651) PaperMC/Paper@eef40b7 Configurable Entity Despawn Time (#11454) PaperMC/Paper@edabff8 Correctly damage tick wolf after armor block (#11653) PaperMC/Paper@6051dac Painting variant registry modification API (#11648) PaperMC/Paper@bb32b05 Call ProjectileHitEvent for entity hits (#11652)
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 28985699d407a69906de670ee67f922df4a6d714..9a48d35cf1266c6fb7ab6cbf23b63a0b56451c0d 100644
|
||||
index efeda71653e51e350daaabef103d89ff33fb384f..d6b1ab5c380f044fd11f5639e1422a55459a2e30 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -1341,6 +1341,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||
@@ -1342,6 +1342,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||
gameprofilerfiller.popPush("nextTickWait");
|
||||
this.mayHaveDelayedTasks = true;
|
||||
this.delayedTasksMaxNextTickTimeNanos = Math.max(Util.getNanos() + i, this.nextTickTimeNanos);
|
||||
|
||||
Reference in New Issue
Block a user