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

Item: clean up internal NBT storage, discard useless legacy network cache

Browse Source 
this will now bail if the NBT string given is invalid upon setCompoundTag(), rather than shitting the bed when it's accessed.
This commit is contained in:
Dylan K. Taylor 2020-02-06 17:59:05 +00:00
parent 79acaa3253
commit 0ec869932f
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/pocketmine/item/Item.php
View File

@ -195,10 +195,8 @@ class Item implements ItemIds, \JsonSerializable{
protected $id; protected $id;
/** @var int */ /** @var int */
protected $meta; protected $meta;
/** @var string */
private $tags = "";
/** @var CompoundTag|null */ /** @var CompoundTag|null */
private $cachedNBT = null; private $nbt = null;
/** @var int */ /** @var int */
public $count = 1; public $count = 1;
/** @var string */ /** @var string */
@ -221,7 +219,8 @@ class Item implements ItemIds, \JsonSerializable{
} }
/** /**
* Sets the Item's NBT * @deprecated This method accepts NBT serialized in a network-dependent format.
* @see Item::setNamedTag()
* *
* @param CompoundTag|string|null $tags * @param CompoundTag|string|null $tags
* *
@ -230,9 +229,10 @@ class Item implements ItemIds, \JsonSerializable{
public function setCompoundTag($tags) : Item{ public function setCompoundTag($tags) : Item{
if($tags instanceof CompoundTag){ if($tags instanceof CompoundTag){
$this->setNamedTag($tags); $this->setNamedTag($tags);
}elseif(is_string($tags) and strlen($tags) > 0){
$this->setNamedTag(self::parseCompoundTag($tags));
}else{ }else{
$this->tags = $tags === null ? "" : (string) $tags; $this->clearNamedTag();
$this->cachedNBT = null;
} }
return $this; return $this;
@ -245,14 +245,14 @@ class Item implements ItemIds, \JsonSerializable{
* Returns the serialized NBT of the Item * Returns the serialized NBT of the Item
*/ */
public function getCompoundTag() : string{ public function getCompoundTag() : string{
return $this->tags; return $this->nbt !== null ? self::writeCompoundTag($this->nbt) : "";
} }
/** /**
* Returns whether this Item has a non-empty NBT. * Returns whether this Item has a non-empty NBT.
*/ */
public function hasCompoundTag() : bool{ public function hasCompoundTag() : bool{
return $this->tags !== ""; return $this->nbt !== null and $this->nbt->getCount() > 0;
} }
public function hasCustomBlockData() : bool{ public function hasCustomBlockData() : bool{
@ -520,11 +520,7 @@ class Item implements ItemIds, \JsonSerializable{
* object is returned to allow the caller to manipulate and apply back to the item. * object is returned to allow the caller to manipulate and apply back to the item.
*/ */
public function getNamedTag() : CompoundTag{ public function getNamedTag() : CompoundTag{
if(!$this->hasCompoundTag() and $this->cachedNBT === null){ return $this->nbt ?? ($this->nbt = new CompoundTag());
$this->cachedNBT = new CompoundTag();
}
return $this->cachedNBT ?? ($this->cachedNBT = self::parseCompoundTag($this->tags));
} }
/** /**
@ -537,8 +533,7 @@ class Item implements ItemIds, \JsonSerializable{
return $this->clearNamedTag(); return $this->clearNamedTag();
} }
$this->cachedNBT = $tag; $this->nbt = clone $tag;
$this->tags = self::writeCompoundTag($tag);
return $this; return $this;
} }
@ -548,7 +543,8 @@ class Item implements ItemIds, \JsonSerializable{
* @return $this * @return $this
*/ */
public function clearNamedTag() : Item{ public function clearNamedTag() : Item{
return $this->setCompoundTag(""); $this->nbt = null;
return $this;
} }
public function getCount() : int{ public function getCount() : int{
@ -888,6 +884,8 @@ class Item implements ItemIds, \JsonSerializable{
} }
public function __clone(){ public function __clone(){
$this->cachedNBT = null; if($this->nbt !== null){
$this->nbt = clone $this->nbt;
}
} }
} }