mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2026-01-04 15:41:40 +00:00
2f835efe4a
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@b6168b7c Get console Brig suggestions from main thread fixes #13027 (#13028) PaperMC/Paper@9d1d0ef3 Add and call RegionizedServerInitEvent from Folia (#13034) PaperMC/Paper@704107c3 Resend frozen ticks when cancelling EntityInsideBlockEvent for powder snow fixes #13033 (#13035) PaperMC/Paper@63cd4af4 Fix createProfile not always returning a new profile (#13036) PaperMC/Paper@49ca2d2d chore: remove experimental status from Damageable#damage (#13021) PaperMC/Paper@65641d10 Only log name instead of full profile for configuration phase disconnects (#13038)
65 lines
3.5 KiB
Diff
65 lines
3.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martijn Muijsers <martijnmuijsers@live.nl>
|
|
Date: Sat, 26 Nov 2022 16:54:05 +0100
|
|
Subject: [PATCH] Measure last tick time
|
|
|
|
License: MIT (https://opensource.org/licenses/MIT)
|
|
Gale - https://galemc.org
|
|
|
|
This patch is based on the following patch:
|
|
"Add getLastTickMs api"
|
|
By: tr7zw <tr7zw@live.de>
|
|
As part of: YAPFA (https://github.com/tr7zw/YAPFA)
|
|
Licensed under: MIT (https://opensource.org/licenses/MIT)
|
|
|
|
* YAPFA copyright *
|
|
|
|
Copyright 2020 tr7zw
|
|
|
|
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
|
|
|
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
|
|
index c5ab5079c953ce9263491b791ebe421032e8f74d..1f3c675cbfe3d6d590bf16270c78e8dccd3e61fc 100644
|
|
--- a/net/minecraft/server/MinecraftServer.java
|
|
+++ b/net/minecraft/server/MinecraftServer.java
|
|
@@ -1141,6 +1141,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
|
private static final java.math.BigDecimal TPS_BASE = new java.math.BigDecimal(1E9).multiply(new java.math.BigDecimal(SAMPLE_INTERVAL));
|
|
// Paper end
|
|
|
|
+ // Gale start - YAPFA - last tick time
|
|
+ public static long lastTickProperTime;
|
|
+ public static long lastTickOversleepTime;
|
|
+ // Gale end - YAPFA - last tick time
|
|
+
|
|
protected void runServer() {
|
|
try {
|
|
if (!this.initServer()) {
|
|
@@ -1227,7 +1232,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
|
this.nextTickTimeNanos += l;
|
|
|
|
this.tickFrame.start();
|
|
+ long tickProperStart = System.nanoTime(); // Gale - YAPFA - last tick time
|
|
this.tickServer(flag ? () -> false : this::haveTime);
|
|
+ lastTickProperTime = (System.nanoTime() - tickProperStart) / 1_000_000L; // Gale - YAPFA - last tick time
|
|
// Paper start - rewrite chunk system
|
|
final Throwable crash = this.chunkSystemCrash;
|
|
if (crash != null) {
|
|
@@ -1356,11 +1363,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
|
protected void waitUntilNextTick() {
|
|
this.runAllTasks();
|
|
this.waitingForNextTick = true;
|
|
+ long tickOversleepStart = System.nanoTime(); // Gale - YAPFA - last tick time
|
|
|
|
try {
|
|
this.managedBlock(() -> !this.haveTime());
|
|
} finally {
|
|
this.waitingForNextTick = false;
|
|
+ lastTickOversleepTime = (System.nanoTime() - tickOversleepStart) / 1000000L; // Gale - YAPFA - last tick time
|
|
}
|
|
}
|
|
|