Merge commit '3b9a5c5ccc22170499b686f59ea55e8be231407a'

# Conflicts:
#	resources/vanilla
#	src/pocketmine/item/Item.php
This commit is contained in:
Dylan K. Taylor 2020-01-31 19:21:03 +00:00
commit 8262633820

View File

@ -41,6 +41,9 @@ class EnchantmentEntry{
$this->randomName = $randomName; $this->randomName = $randomName;
} }
/**
* @return Enchantment[]
*/
public function getEnchantments() : array{ public function getEnchantments() : array{
return $this->enchantments; return $this->enchantments;
} }