diff --git a/src/pocketmine/level/LevelTimings.php b/src/pocketmine/level/LevelTimings.php index de925cd6c..5b7defdbe 100644 --- a/src/pocketmine/level/LevelTimings.php +++ b/src/pocketmine/level/LevelTimings.php @@ -80,15 +80,14 @@ class LevelTimings{ $this->entityTick = new TimingsHandler("** " . $name . "entityTick"); $this->tileEntityTick = new TimingsHandler("** " . $name . "tileEntityTick"); - $this->syncChunkSendTimer = new TimingsHandler("** " . $name . "syncChunkSend"); - $this->syncChunkSendPrepareTimer = new TimingsHandler("** " . $name . "syncChunkSendPrepare"); + Timings::init(); //make sure the timers we want are available + $this->syncChunkSendTimer = new TimingsHandler("** " . $name . "syncChunkSend", Timings::$playerChunkSendTimer); + $this->syncChunkSendPrepareTimer = new TimingsHandler("** " . $name . "syncChunkSendPrepare", Timings::$playerChunkSendTimer); - $this->syncChunkLoadTimer = new TimingsHandler("** " . $name . "syncChunkLoad"); + $this->syncChunkLoadTimer = new TimingsHandler("** " . $name . "syncChunkLoad", Timings::$worldLoadTimer); $this->syncChunkLoadDataTimer = new TimingsHandler("** " . $name . "syncChunkLoad - Data"); $this->syncChunkLoadEntitiesTimer = new TimingsHandler("** " . $name . "syncChunkLoad - Entities"); $this->syncChunkLoadTileEntitiesTimer = new TimingsHandler("** " . $name . "syncChunkLoad - TileEntities"); - - Timings::init(); //make sure the timer we want is available $this->syncChunkSaveTimer = new TimingsHandler("** " . $name . "syncChunkSave", Timings::$worldSaveTimer); $this->doTick = new TimingsHandler($name . "doTick"); diff --git a/src/pocketmine/timings/Timings.php b/src/pocketmine/timings/Timings.php index a234d5024..6fd16e246 100644 --- a/src/pocketmine/timings/Timings.php +++ b/src/pocketmine/timings/Timings.php @@ -59,6 +59,8 @@ abstract class Timings{ /** @var TimingsHandler */ public static $serverCommandTimer; /** @var TimingsHandler */ + public static $worldLoadTimer; + /** @var TimingsHandler */ public static $worldSaveTimer; /** @var TimingsHandler */ public static $populationTimer; @@ -126,6 +128,7 @@ abstract class Timings{ self::$connectionTimer = new TimingsHandler("Connection Handler"); self::$schedulerTimer = new TimingsHandler("Scheduler"); self::$serverCommandTimer = new TimingsHandler("Server Command"); + self::$worldLoadTimer = new TimingsHandler("World Load"); self::$worldSaveTimer = new TimingsHandler("World Save"); self::$populationTimer = new TimingsHandler("World Population"); self::$generationCallbackTimer = new TimingsHandler("World Generation Callback");