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

Merge commit '9eebfa7cc30c8a5ac39f192c79023131623ad4b4'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/Server.php
#	src/pocketmine/Achievement.php
This commit is contained in:
Dylan K. Taylor 2020-01-31 20:07:21 +00:00
commit ee4757303b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/CrashDump.php
View File

@ -127,6 +127,9 @@ class CrashDump{
return $this->encodedData; return $this->encodedData;
} }
/**
* @return mixed[]
*/
public function getData() : array{ public function getData() : array{
return $this->data; return $this->data;
} }

2
src/Server.php
View File

@ -1416,7 +1416,7 @@ class Server{
} }
/** /**
* @param array|null $trace * @param mixed[][]|null $trace
*/ */
public function exceptionHandler(\Throwable $e, $trace = null) : void{ public function exceptionHandler(\Throwable $e, $trace = null) : void{
while(@ob_end_flush()){} while(@ob_end_flush()){}