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

Merge commit '4ff4434a220813e446efde4a38e48a0416476dba'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/item/Banner.php
#	src/pocketmine/item/Item.php
This commit is contained in:
Dylan K. Taylor 2020-01-31 20:11:29 +00:00
commit 96ac95798b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/server-phar.php
View File

@ -41,7 +41,7 @@ function preg_quote_array(array $strings, string $delim = null) : array{
* @param string $pharPath * @param string $pharPath
* @param string $basePath * @param string $basePath
* @param string[] $includedPaths * @param string[] $includedPaths
* @param array $metadata * @param mixed[] $metadata
* @param string $stub * @param string $stub
* @param int $signatureAlgo * @param int $signatureAlgo
* @param int|null $compression * @param int|null $compression

3
src/item/Item.php
View File

@ -573,6 +573,8 @@ class Item implements \JsonSerializable{
/** /**
* Returns an array of item stack properties that can be serialized to json. * Returns an array of item stack properties that can be serialized to json.
*
* @return mixed[]
*/ */
final public function jsonSerialize() : array{ final public function jsonSerialize() : array{
$data = [ $data = [
@ -596,6 +598,7 @@ class Item implements \JsonSerializable{
/** /**
* Returns an Item from properties created in an array by {@link Item#jsonSerialize} * Returns an Item from properties created in an array by {@link Item#jsonSerialize}
* @param mixed[] $data
* *
* @throws NbtDataException * @throws NbtDataException
* @throws \InvalidArgumentException * @throws \InvalidArgumentException