mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 01:46:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'next-minor'

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-12-12 13:52:14 +00:00
parent 6935030e0c 1a467420e3
commit a9c09e4517
12 changed files with 81 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/timings/Timings.php
View File

@ -32,6 +32,8 @@ use pocketmine\scheduler\TaskHandler;
use function dechex;
abstract class Timings{
/** @var bool */
private static $initialized = false;
/** @var TimingsHandler */
public static $fullTickTimer;
@ -113,9 +115,10 @@ abstract class Timings{
public static $pluginTaskTimingMap = [];
public static function init() : void{
if(self::$serverTickTimer instanceof TimingsHandler){
if(self::$initialized){
return;
}
self::$initialized = true;
self::$fullTickTimer = new TimingsHandler("Full Server Tick");
self::$serverTickTimer = new TimingsHandler("** Full Server Tick", self::$fullTickTimer);

2
src/timings/TimingsHandler.php
View File

@ -168,7 +168,7 @@ class TimingsHandler{
public function stopTiming() : void{
if(self::$enabled){
if(--$this->timingDepth !== 0 or $this->start === 0){
if(--$this->timingDepth !== 0 or $this->start == 0){
return;
}