From e5149756a8de7175594cea4dca072397c11b9751 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 27 Nov 2021 00:06:09 +0000 Subject: [PATCH] WorldTimings: fixed merge error introduced by 3bf87378ef24eec8845bb048a6916f188d9b1220 --- src/world/WorldTimings.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/world/WorldTimings.php b/src/world/WorldTimings.php index 2ace793179..ac060e9a3d 100644 --- a/src/world/WorldTimings.php +++ b/src/world/WorldTimings.php @@ -64,14 +64,14 @@ class WorldTimings{ $this->entityTick = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Tick Entities"); Timings::init(); //make sure the timers we want are available - $this->syncChunkSend = new TimingsHandler("** " . $name . "Player Send Chunks", Timings::$playerChunkSend); - $this->syncChunkSendPrepare = new TimingsHandler("** " . $name . "Player Send Chunk Prepare", Timings::$playerChunkSend); + $this->syncChunkSend = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Player Send Chunks", Timings::$playerChunkSend); + $this->syncChunkSendPrepare = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Player Send Chunk Prepare", Timings::$playerChunkSend); - $this->syncChunkLoad = new TimingsHandler("** " . $name . "Chunk Load", Timings::$worldLoad); - $this->syncChunkLoadData = new TimingsHandler("** " . $name . "Chunk Load - Data"); - $this->syncChunkLoadEntities = new TimingsHandler("** " . $name . "Chunk Load - Entities"); - $this->syncChunkLoadTileEntities = new TimingsHandler("** " . $name . "Chunk Load - TileEntities"); - $this->syncChunkSave = new TimingsHandler("** " . $name . "Chunk Save", Timings::$worldSave); + $this->syncChunkLoad = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Chunk Load", Timings::$worldLoad); + $this->syncChunkLoadData = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Chunk Load - Data"); + $this->syncChunkLoadEntities = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Chunk Load - Entities"); + $this->syncChunkLoadTileEntities = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Chunk Load - TileEntities"); + $this->syncChunkSave = new TimingsHandler(Timings::INCLUDED_BY_OTHER_TIMINGS_PREFIX . $name . "Chunk Save", Timings::$worldSave); $this->doTick = new TimingsHandler($name . "World Tick"); }