mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-08 10:53:05 +00:00
Code Issues Projects Releases Wiki Activity

Timings: Clean up some terrible code, move namespaces

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-03-19 19:05:51 +00:00
parent 209e28dfe5
commit 73e09392b6
20 changed files with 101 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,19 +23,18 @@ declare(strict_types=1);
namespace pocketmine\plugin;
use pocketmine\command\defaults\TimingsCommand;
use pocketmine\command\PluginCommand;
use pocketmine\command\SimpleCommandMap;
use pocketmine\event\Event;
use pocketmine\event\EventPriority;
use pocketmine\event\HandlerList;
use pocketmine\event\Listener;
use pocketmine\event\Timings;
use pocketmine\event\TimingsHandler;
use pocketmine\network\mcpe\protocol\ProtocolInfo;
use pocketmine\permission\Permissible;
use pocketmine\permission\Permission;
use pocketmine\Server;
use pocketmine\timings\Timings;
use pocketmine\timings\TimingsHandler;
/**
* Manages all the plugins, Permissions and Permissibles
@ -91,8 +90,6 @@ class PluginManager{
/** @var TimingsHandler */
public static $pluginParentTimer;
public static $useTimings = false;
/**
* @param Server $server
* @param SimpleCommandMap $commandMap
@ -334,12 +331,8 @@ class PluginManager{
}
}
TimingsCommand::$timingStart = microtime(true);
return $loadedPlugins;
}else{
TimingsCommand::$timingStart = microtime(true);
return [];
}
}
@ -798,19 +791,4 @@ class PluginManager{
return $event::$handlerList;
}
/**
* @return bool
*/
public function useTimings() : bool{
return self::$useTimings;
}
/**
* @param bool $use
*/
public function setUseTimings(bool $use){
self::$useTimings = $use;
}
}

2
src/pocketmine/plugin/RegisteredListener.php
View File

@ -26,7 +26,7 @@ namespace pocketmine\plugin;
use pocketmine\event\Cancellable;
use pocketmine\event\Event;
use pocketmine\event\Listener;
use pocketmine\event\TimingsHandler;
use pocketmine\timings\TimingsHandler;
class RegisteredListener{