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

PHP7 to master

Browse Source
This commit is contained in:
Intyre
2016-02-21 12:47:30 +01:00
parent fc42fc534b 9acbd85b25
commit a6cd526e60
153 changed files with 2836 additions and 3536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/plugin/PluginLogger.php
View File

@ -87,10 +87,14 @@ class PluginLogger implements \AttachableLogger{
$this->log(LogLevel::DEBUG, $message);
}
public function logException(\Throwable $e, $trace = null){
Server::getInstance()->getLogger()->logException($e, $trace);
}
public function log($level, $message){
Server::getInstance()->getLogger()->log($level, $this->pluginName . $message);
foreach($this->attachments as $attachment){
$attachment->log($level, $message);
}
}
}
}

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

@ -249,12 +249,9 @@ class PluginManager{
}
}
}
}catch(\Exception $e){
}catch(\Throwable $e){
$this->server->getLogger()->error($this->server->getLanguage()->translateString("pocketmine.plugin.fileError", [$file, $directory, $e->getMessage()]));
$logger = $this->server->getLogger();
if($logger instanceof MainLogger){
$logger->logException($e);
}
$this->server->getLogger()->logException($e);
}
}
}
@ -433,7 +430,7 @@ class PluginManager{
if(!isset($this->permSubs[$permission])){
$this->permSubs[$permission] = [];
}
$this->permSubs[$permission][spl_object_hash($permissible)] = new \WeakRef($permissible);
$this->permSubs[$permission][spl_object_hash($permissible)] = $permissible;
}
/**
@ -456,6 +453,7 @@ class PluginManager{
*/
public function getPermissionSubscriptions($permission){
if(isset($this->permSubs[$permission])){
return $this->permSubs[$permission];
$subs = [];
foreach($this->permSubs[$permission] as $k => $perm){
/** @var \WeakRef $perm */
@ -479,9 +477,9 @@ class PluginManager{
*/
public function subscribeToDefaultPerms($op, Permissible $permissible){
if($op === true){
$this->defSubsOp[spl_object_hash($permissible)] = new \WeakRef($permissible);
$this->defSubsOp[spl_object_hash($permissible)] = $permissible;
}else{
$this->defSubs[spl_object_hash($permissible)] = new \WeakRef($permissible);
$this->defSubs[spl_object_hash($permissible)] = $permissible;
}
}
@ -506,6 +504,7 @@ class PluginManager{
$subs = [];
if($op === true){
return $this->defSubsOp;
foreach($this->defSubsOp as $k => $perm){
/** @var \WeakRef $perm */
if($perm->acquire()){
@ -516,6 +515,7 @@ class PluginManager{
}
}
}else{
return $this->defSubs;
foreach($this->defSubs as $k => $perm){
/** @var \WeakRef $perm */
if($perm->acquire()){
@ -560,11 +560,8 @@ class PluginManager{
$this->addPermission($perm);
}
$plugin->getPluginLoader()->enablePlugin($plugin);
}catch(\Exception $e){
$logger = Server::getInstance()->getLogger();
if($logger instanceof MainLogger){
$logger->logException($e);
}
}catch(\Throwable $e){
$this->server->getLogger()->logException($e);
$this->disablePlugin($plugin);
}
}
@ -634,11 +631,8 @@ class PluginManager{
if($plugin->isEnabled()){
try{
$plugin->getPluginLoader()->disablePlugin($plugin);
}catch(\Exception $e){
$logger = Server::getInstance()->getLogger();
if($logger instanceof MainLogger){
$logger->logException($e);
}
}catch(\Throwable $e){
$this->server->getLogger()->logException($e);
}
$this->server->getScheduler()->cancelTasks($plugin);
@ -671,7 +665,7 @@ class PluginManager{
try{
$registration->callEvent($event);
}catch(\Exception $e){
}catch(\Throwable $e){
$this->server->getLogger()->critical(
$this->server->getLanguage()->translateString("pocketmine.plugin.eventError", [
$event->getEventName(),
@ -679,10 +673,7 @@ class PluginManager{
$e->getMessage(),
get_class($registration->getListener())
]));
$logger = $this->server->getLogger();
if($logger instanceof MainLogger){
$logger->logException($e);
}
$this->server->getLogger()->logException($e);
}
}
}