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

Merge commit 'd3021c628134293c2b8af505806efc2fba4fe947'

Browse Source 
# Conflicts:
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor 2020-01-31 20:03:27 +00:00
commit 721bd8f02b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/utils/Config.php
View File

@ -471,7 +471,8 @@ class Config{
} }
/** /**
* @param array $data reference parameter * @param mixed[] $default
* @param mixed[] $data reference parameter
*/ */
private function fillDefaults(array $default, &$data) : int{ private function fillDefaults(array $default, &$data) : int{
$changed = 0; $changed = 0;

2
src/utils/MainLogger.php
View File

@ -139,7 +139,7 @@ class MainLogger extends \AttachableThreadedLogger{
} }
/** /**
* @param array|null $trace * @param mixed[][]|null $trace
* *
* @return void * @return void
*/ */