diff --git a/src/pocketmine/plugin/PluginManager.php b/src/pocketmine/plugin/PluginManager.php index 009afc86d..2da8bdbc0 100644 --- a/src/pocketmine/plugin/PluginManager.php +++ b/src/pocketmine/plugin/PluginManager.php @@ -102,9 +102,6 @@ class PluginManager{ /** @var string|null */ private $pluginDataDirectory; - /** @var TimingsHandler */ - public static $pluginParentTimer; - /** * @param Server $server * @param SimpleCommandMap $commandMap @@ -844,7 +841,7 @@ class PluginManager{ throw new PluginException("Plugin attempted to register " . $event . " while not enabled"); } - $timings = new TimingsHandler("Plugin: " . $plugin->getDescription()->getFullName() . " Event: " . get_class($listener) . "::" . ($executor instanceof MethodEventExecutor ? $executor->getMethod() : "???") . "(" . (new \ReflectionClass($event))->getShortName() . ")", self::$pluginParentTimer); + $timings = new TimingsHandler("Plugin: " . $plugin->getDescription()->getFullName() . " Event: " . get_class($listener) . "::" . ($executor instanceof MethodEventExecutor ? $executor->getMethod() : "???") . "(" . (new \ReflectionClass($event))->getShortName() . ")"); $this->getEventListeners($event)->register(new RegisteredListener($listener, $executor, $priority, $plugin, $ignoreCancelled, $timings)); } diff --git a/src/pocketmine/timings/Timings.php b/src/pocketmine/timings/Timings.php index a92e02be3..91df09a92 100644 --- a/src/pocketmine/timings/Timings.php +++ b/src/pocketmine/timings/Timings.php @@ -26,7 +26,6 @@ namespace pocketmine\timings; use pocketmine\entity\Entity; use pocketmine\network\mcpe\protocol\DataPacket; use pocketmine\Player; -use pocketmine\plugin\PluginManager; use pocketmine\scheduler\TaskHandler; use pocketmine\tile\Tile; @@ -134,7 +133,7 @@ abstract class Timings{ self::$timerEntityBaseTick = new TimingsHandler("** entityBaseTick"); self::$timerLivingEntityBaseTick = new TimingsHandler("** livingEntityBaseTick"); - self::$schedulerSyncTimer = new TimingsHandler("** Scheduler - Sync Tasks", PluginManager::$pluginParentTimer); + self::$schedulerSyncTimer = new TimingsHandler("** Scheduler - Sync Tasks"); self::$schedulerAsyncTimer = new TimingsHandler("** Scheduler - Async Tasks"); self::$playerCommandTimer = new TimingsHandler("** playerCommand");