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

Merge commit '4c36ca58e2710c8fd03eec1f50a885fb97fd9b68'

Browse Source 
# Conflicts:
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor 2020-01-31 19:19:06 +00:00
commit 09b24d3c32
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/crafting/CraftingManager.php
View File

@ -167,6 +167,9 @@ class CraftingManager{
return $result; return $result;
} }
/**
* @param Item[] $outputs
*/
private static function hashOutputs(array $outputs) : string{ private static function hashOutputs(array $outputs) : string{
$outputs = self::pack($outputs); $outputs = self::pack($outputs);
usort($outputs, [self::class, "sort"]); usort($outputs, [self::class, "sort"]);

3
src/crafting/ShapelessRecipe.php
View File

@ -52,6 +52,9 @@ class ShapelessRecipe implements CraftingRecipe{
$this->results = Utils::cloneObjectArray($results); $this->results = Utils::cloneObjectArray($results);
} }
/**
* @return Item[]
*/
public function getResults() : array{ public function getResults() : array{
return Utils::cloneObjectArray($this->results); return Utils::cloneObjectArray($this->results);
} }