mirror of
https://github.com/Samsuik/Sakura.git
synced 2025-12-19 14:59:30 +00:00
f194568a55
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@e0ba395 Add missing plugin ticket comparator fixes #13130 PaperMC/Paper@21b4930 Fix diff in FlowingFluid#canPassThroughWall PaperMC/Paper@dcd7847 Improve server tick loop PaperMC/Paper@a4a7461 Rebase fixups PaperMC/Paper@dc66e8c Return Server#getTPS over minute intervals instead of seconds PaperMC/Paper@b63dc92 Restore currentTick counter increment as temp feature patch PaperMC/Paper@523efa4 Flatten currentTick incr into file patches PaperMC/Paper@4dcd837 Add CommandSourceStack to UnknownCommandEvent (#13083) PaperMC/Paper@ffd5158 Update 1.21.9 reobf mappings data (#13135) PaperMC/Paper@b4b1f11 [ci skip] Add docs for virtual createMerchant in MerchantInventoryViewBuilder#merchant (#13125) PaperMC/Paper@b3d2158 Disable javadoc.io links PaperMC/Paper@8483163 Yield millis from Bukkit#getAverageTickTime
60 lines
3.3 KiB
Diff
60 lines
3.3 KiB
Diff
--- a/net/minecraft/server/MinecraftServer.java
|
|
+++ b/net/minecraft/server/MinecraftServer.java
|
|
@@ -299,6 +_,7 @@
|
|
public volatile boolean abnormalExit; // Paper - Improved watchdog support
|
|
public volatile Thread shutdownThread; // Paper - Improved watchdog support
|
|
public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations; // Paper - add paper configuration files
|
|
+ public final me.samsuik.sakura.configuration.SakuraConfigurations sakuraConfigurations; // Sakura
|
|
public boolean isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
|
|
private final Set<String> pluginsBlockingSleep = new java.util.HashSet<>(); // Paper - API to allow/disallow tick sleeping
|
|
public static final long SERVER_INIT = System.nanoTime(); // Paper - Lag compensation
|
|
@@ -362,6 +_,17 @@
|
|
thread.start();
|
|
return minecraftServer;
|
|
}
|
|
+ // Sakura start - track tick information
|
|
+ private final me.samsuik.sakura.tps.TickInformationCollector tickInformationCollector = new me.samsuik.sakura.tps.TickInformationCollector();
|
|
+
|
|
+ public final me.samsuik.sakura.tps.ServerTickInformation latestTickInformation() {
|
|
+ return this.tickInformationCollector.latestTickInformation();
|
|
+ }
|
|
+
|
|
+ public final ImmutableList<me.samsuik.sakura.tps.ServerTickInformation> tickHistory(final long from, final long to) {
|
|
+ return this.tickInformationCollector.collect(from, to);
|
|
+ }
|
|
+ // Sakura end - track tick information
|
|
|
|
// Paper start - rewrite chunk system
|
|
private volatile Throwable chunkSystemCrash;
|
|
@@ -512,6 +_,10 @@
|
|
Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
|
|
// CraftBukkit end
|
|
this.paperConfigurations = services.paper().configurations(); // Paper - add paper configuration files
|
|
+ // Sakura start - sakura configuration files
|
|
+ final java.nio.file.Path sakuraConfigDirPath = ((java.io.File) options.valueOf("sakura-settings-directory")).toPath();
|
|
+ this.sakuraConfigurations = me.samsuik.sakura.configuration.SakuraConfigurations.setup(sakuraConfigDirPath);
|
|
+ // Sakura end - sakura configuration files
|
|
}
|
|
|
|
private void readScoreboard(DimensionDataStorage dataStorage) {
|
|
@@ -1277,6 +_,11 @@
|
|
|
|
this.currentTickStart = tickStart;
|
|
++MinecraftServer.currentTick;
|
|
+ // Sakura start - track tick information
|
|
+ if (MinecraftServer.currentTick % 20 == 0) {
|
|
+ this.tickInformationCollector.levelData(this.levels.values(), getTPS(this.tickTimes1s, tickStart, l));
|
|
+ }
|
|
+ // Sakura end - track tick information
|
|
// Paper end - improve tick loop
|
|
|
|
boolean flag = l == 0L;
|
|
@@ -1303,6 +_,7 @@
|
|
this.tickFrame.end();
|
|
this.recordEndOfTick(); // Paper - improve tick loop
|
|
profilerFiller.popPush("nextTickWait");
|
|
+ this.tickInformationCollector.tickDuration((System.nanoTime() - tickStart) / 1_000_000L); // Sakura - track tick information
|
|
this.mayHaveDelayedTasks = true;
|
|
this.delayedTasksMaxNextTickTimeNanos = Math.max(Util.getNanos() + l, this.nextTickTimeNanos);
|
|
this.startMeasuringTaskExecutionTime();
|