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

Merge branch '3.6'

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-03-04 12:02:36 +00:00
commit f87dac7bb2
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pocketmine/Server.php
View File

@ -126,6 +126,7 @@ use function max;
use function microtime; use function microtime;
use function min; use function min;
use function mkdir; use function mkdir;
use function ob_end_flush;
use function preg_replace; use function preg_replace;
use function random_bytes; use function random_bytes;
use function realpath; use function realpath;
@ -1742,6 +1743,7 @@ class Server{
* @param array|null $trace * @param array|null $trace
*/ */
public function exceptionHandler(\Throwable $e, $trace = null) : void{ public function exceptionHandler(\Throwable $e, $trace = null) : void{
while(@ob_end_flush()){}
global $lastError; global $lastError;
if($trace === null){ if($trace === null){
@ -1773,6 +1775,7 @@ class Server{
} }
public function crashDump() : void{ public function crashDump() : void{
while(@ob_end_flush()){}
if(!$this->isRunning){ if(!$this->isRunning){
return; return;
} }