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

Merge commit '8dcc88712c6b8a4d4a0c6be2f6b908ae85378209'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/level/format/io/ChunkUtils.php
#	tests/phpstan/configs/l7-baseline.neon
This commit is contained in:
Dylan K. Taylor 2020-06-17 20:42:28 +01:00
commit d2130265f8
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/world/format/io/ChunkUtils.php
View File

@ -32,6 +32,7 @@ class ChunkUtils{
* Converts pre-MCPE-1.0 biome color array to biome ID array. * Converts pre-MCPE-1.0 biome color array to biome ID array.
* *
* @param int[] $array of biome color values * @param int[] $array of biome color values
* @phpstan-param array<int, int> $array
*/ */
public static function convertBiomeColors(array $array) : string{ public static function convertBiomeColors(array $array) : string{
$result = str_repeat("\x00", 256); $result = str_repeat("\x00", 256);

5
tests/phpstan/configs/l7-baseline.neon
View File

@ -1020,11 +1020,6 @@ parameters:
count: 2 count: 2
path: ../../../src/world/format/Chunk.php path: ../../../src/world/format/Chunk.php
-
message: "#^Method pocketmine\\\\world\\\\format\\\\io\\\\ChunkUtils\\:\\:convertBiomeColors\\(\\) should return string but returns array\\<string\\>\\|string\\.$#"
count: 1
path: ../../../src/world/format/io/ChunkUtils.php
- -
message: "#^Parameter \\#1 \\$className of static method pocketmine\\\\utils\\\\Utils\\:\\:testValidInstance\\(\\) expects class\\-string, string given\\.$#" message: "#^Parameter \\#1 \\$className of static method pocketmine\\\\utils\\\\Utils\\:\\:testValidInstance\\(\\) expects class\\-string, string given\\.$#"
count: 1 count: 1