mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-21 16:24:05 +00:00
Code Issues Projects Releases Wiki Activity

Fixed some very unusual crashdumps reporting non-fatal errors when plugins use die() or exit()

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-06-22 19:08:33 +01:00
parent 9047c2c1ef
commit 4b4f2af9e3
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/pocketmine/PocketMine.php
View File

@ -89,6 +89,16 @@ namespace pocketmine {
* Enjoy it as much as I did writing it. I don't want to do it again.
*/
error_reporting(-1);
set_error_handler(function($severity, $message, $file, $line){
if((error_reporting() & $severity)){
throw new \ErrorException($message, 0, $severity, $file, $line);
}else{ //stfu operator
return true;
}
});
if(!extension_loaded("phar")){
echo "[CRITICAL] Unable to find the Phar extension." . PHP_EOL;
echo "[CRITICAL] Please use the installer provided on the homepage." . PHP_EOL;
@ -96,9 +106,9 @@ namespace pocketmine {
}
if(\Phar::running(true) !== ""){
@define('pocketmine\PATH', \Phar::running(true) . "/");
define('pocketmine\PATH', \Phar::running(true) . "/");
}else{
@define('pocketmine\PATH', \getcwd() . DIRECTORY_SEPARATOR);
define('pocketmine\PATH', \getcwd() . DIRECTORY_SEPARATOR);
}
if(version_compare("7.0", PHP_VERSION) > 0){
@ -139,14 +149,6 @@ namespace pocketmine {
set_time_limit(0); //Who set it to 30 seconds?!?!
error_reporting(-1);
set_error_handler(function($severity, $message, $file, $line){
if((error_reporting() & $severity)){
throw new \ErrorException($message, 0, $severity, $file, $line);
}
});
ini_set("allow_url_fopen", '1');
ini_set("display_errors", '1');
ini_set("display_startup_errors", '1');

1
src/pocketmine/Server.php
View File

@ -2183,7 +2183,6 @@ class Server{
}catch(\Throwable $e){
$this->logger->logException($e);
$this->logger->critical($this->getLanguage()->translateString("pocketmine.crash.error", [$e->getMessage()]));
return;
}
//$this->checkMemory();