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

Merge branch 'release/3.1' into release/3.2

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-07-26 10:25:19 +01:00
commit 8fae79f85b
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pocketmine/plugin/PluginManager.php
View File

@ -72,9 +72,6 @@ class PluginManager{
/** @var string|null */ /** @var string|null */
private $pluginDataDirectory; private $pluginDataDirectory;
/** @var TimingsHandler */
public static $pluginParentTimer;
/** /**
* @param Server $server * @param Server $server
* @param SimpleCommandMap $commandMap * @param SimpleCommandMap $commandMap
@ -804,7 +801,7 @@ class PluginManager{
throw new PluginException("Plugin attempted to register " . $event . " while not enabled"); 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)); $this->getEventListeners($event)->register(new RegisteredListener($listener, $executor, $priority, $plugin, $ignoreCancelled, $timings));
} }

3
src/pocketmine/timings/Timings.php
View File

@ -26,7 +26,6 @@ namespace pocketmine\timings;
use pocketmine\entity\Entity; use pocketmine\entity\Entity;
use pocketmine\network\mcpe\protocol\DataPacket; use pocketmine\network\mcpe\protocol\DataPacket;
use pocketmine\Player; use pocketmine\Player;
use pocketmine\plugin\PluginManager;
use pocketmine\scheduler\TaskHandler; use pocketmine\scheduler\TaskHandler;
use pocketmine\tile\Tile; use pocketmine\tile\Tile;
@ -134,7 +133,7 @@ abstract class Timings{
self::$timerEntityBaseTick = new TimingsHandler("** entityBaseTick"); self::$timerEntityBaseTick = new TimingsHandler("** entityBaseTick");
self::$timerLivingEntityBaseTick = new TimingsHandler("** livingEntityBaseTick"); 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::$schedulerAsyncTimer = new TimingsHandler("** Scheduler - Async Tasks");
self::$playerCommandTimer = new TimingsHandler("** playerCommand"); self::$playerCommandTimer = new TimingsHandler("** playerCommand");