Merge branch 'master' into mcpe-1.0

This commit is contained in:
Dylan K. Taylor
2016-12-16 10:29:58 +00:00
27 changed files with 130 additions and 63 deletions

View File

@ -35,6 +35,7 @@ use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\ListTag;
use pocketmine\nbt\tag\ShortTag;
use pocketmine\nbt\tag\StringTag;
use pocketmine\nbt\tag\Tag;
use pocketmine\Player;
use pocketmine\Server;
use pocketmine\utils\Config;
@ -594,6 +595,10 @@ class Item implements ItemIds, \JsonSerializable{
return $this;
}
/**
* @param $name
* @return Tag|null
*/
public function getNamedTagEntry($name){
$tag = $this->getNamedTag();
if($tag !== null){