mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-05 17:41:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release/3.0' into release/3.1

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-08-02 14:43:44 +01:00
commit 61accee682
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/Server.php
View File

@ -2144,10 +2144,6 @@ class Server{
* @param array|null $trace * @param array|null $trace
*/ */
public function exceptionHandler(\Throwable $e, $trace = null){ public function exceptionHandler(\Throwable $e, $trace = null){
if($e === null){
return;
}
global $lastError; global $lastError;
if($trace === null){ if($trace === null){
@ -2205,7 +2201,7 @@ class Server{
} }
} }
if($dump->getData()["error"]["type"] === "E_PARSE" or $dump->getData()["error"]["type"] === "E_COMPILE_ERROR"){ if($dump->getData()["error"]["type"] === \ParseError::class){
$report = false; $report = false;
} }