twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-07 23:52:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

More Upstream tacos

Browse Source
This commit is contained in:
Aikar
2016-06-30 01:38:53 -04:00
parent 869b06ea1e
commit 122f47ac1c
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Spigot-Server-Patches/Timings-v2.patch
View File

@@ -524,6 +524,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
public void D() { public void D() {
- SpigotTimings.schedulerTimer.startTiming(); // Spigot
+ MinecraftTimings.bukkitSchedulerTimer.startTiming(); // Paper
this.server.getScheduler().mainThreadHeartbeat(this.ticks); // CraftBukkit
- SpigotTimings.schedulerTimer.stopTiming(); // Spigot
+ MinecraftTimings.bukkitSchedulerTimer.stopTiming(); // Paper
+ MinecraftTimings.minecraftSchedulerTimer.startTiming(); // Paper + MinecraftTimings.minecraftSchedulerTimer.startTiming(); // Paper
this.methodProfiler.a("jobs"); this.methodProfiler.a("jobs");
Queue queue = this.j; Queue queue = this.j;
@@ -536,13 +541,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
this.methodProfiler.c("levels"); this.methodProfiler.c("levels");
- SpigotTimings.schedulerTimer.startTiming(); // Spigot
+ MinecraftTimings.bukkitSchedulerTimer.startTiming(); // Paper
// CraftBukkit start // CraftBukkit start
this.server.getScheduler().mainThreadHeartbeat(this.ticks);
- SpigotTimings.schedulerTimer.stopTiming(); // Spigot
+ MinecraftTimings.bukkitSchedulerTimer.stopTiming(); // Paper
// Run tasks that are waiting on processing // Run tasks that are waiting on processing
- SpigotTimings.processQueueTimer.startTiming(); // Spigot - SpigotTimings.processQueueTimer.startTiming(); // Spigot
+ MinecraftTimings.processQueueTimer.startTiming(); // Spigot + MinecraftTimings.processQueueTimer.startTiming(); // Spigot

2
work/CraftBukkit

Submodule work/CraftBukkit updated: 1faaa340e5...6b843d995f

2
work/Spigot

Submodule work/Spigot updated: 65a0f1170c...3996d7d5c0