Merge commit 'f3063e797fab56ff8d0213c8e5a3904085a6eb79'

# Conflicts:
#	resources/vanilla
#	src/pocketmine/level/format/io/ChunkUtils.php
This commit is contained in:
Dylan K. Taylor 2020-06-17 20:43:30 +01:00
commit a2677eba02

View File

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