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

Added Error -> Exception handling

Browse Source
This commit is contained in:
Shoghi Cervantes
2014-10-28 20:43:36 +01:00
parent 0fce83c671
commit b6f7ee20fc
11 changed files with 114 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,7 @@ use pocketmine\event\TimingsHandler;
use pocketmine\permission\Permissible;
use pocketmine\permission\Permission;
use pocketmine\Server;
use pocketmine\utils\MainLogger;
/**
* Manages all the plugins, Permissions and Permissibles
@ -546,12 +547,18 @@ class PluginManager{
*/
public function enablePlugin(Plugin $plugin){
if(!$plugin->isEnabled()){
foreach($plugin->getDescription()->getPermissions() as $perm){
$this->addPermission($perm);
try{
foreach($plugin->getDescription()->getPermissions() as $perm){
$this->addPermission($perm);
}
$plugin->getPluginLoader()->enablePlugin($plugin);
}catch(\Exception $e){
$logger = Server::getInstance()->getLogger();
if($logger instanceof MainLogger){
$logger->logException($e);
}
$this->disablePlugin($plugin);
}
$plugin->getPluginLoader()->enablePlugin($plugin);
}
}
@ -617,7 +624,15 @@ class PluginManager{
*/
public function disablePlugin(Plugin $plugin){
if($plugin->isEnabled()){
$plugin->getPluginLoader()->disablePlugin($plugin);
try{
$plugin->getPluginLoader()->disablePlugin($plugin);
}catch(\Exception $e){
$logger = Server::getInstance()->getLogger();
if($logger instanceof MainLogger){
$logger->logException($e);
}
}
$this->server->getScheduler()->cancelTasks($plugin);
HandlerList::unregisterAll($plugin);
foreach($plugin->getDescription()->getPermissions() as $perm){