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

Remove network-serialized item NBT from API layer, item NBT is now retained for the lifetime of the stack

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-10-27 15:26:01 +01:00
parent d2513ff908
commit 9bb3c93285
7 changed files with 66 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/pocketmine/network/mcpe/NetworkBinaryStream.php
View File

@ -30,12 +30,15 @@ use pocketmine\entity\Entity;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\math\Vector3;
use pocketmine\nbt\LittleEndianNBTStream;
use pocketmine\network\mcpe\protocol\types\CommandOriginData;
use pocketmine\network\mcpe\protocol\types\EntityLink;
use pocketmine\utils\BinaryStream;
use pocketmine\utils\UUID;
class NetworkBinaryStream extends BinaryStream{
/** @var LittleEndianNBTStream */
private static $itemNbtSerializer = null;
public function getString() : string{
return $this->get($this->getUnsignedVarInt());
@ -77,10 +80,12 @@ class NetworkBinaryStream extends BinaryStream{
$cnt = $auxValue & 0xff;
$nbtLen = $this->getLShort();
$nbt = "";
$compound = null;
if($nbtLen > 0){
$nbt = $this->get($nbtLen);
if(self::$itemNbtSerializer === null){
self::$itemNbtSerializer = new LittleEndianNBTStream();
}
$compound = self::$itemNbtSerializer->read($this->get($nbtLen));
}
//TODO
@ -93,7 +98,7 @@ class NetworkBinaryStream extends BinaryStream{
$this->getString();
}
return ItemFactory::get($id, $data, $cnt, $nbt);
return ItemFactory::get($id, $data, $cnt, $compound);
}
@ -108,10 +113,17 @@ class NetworkBinaryStream extends BinaryStream{
$auxValue = (($item->getDamage() & 0x7fff) << 8) | $item->getCount();
$this->putVarInt($auxValue);
$nbt = $item->getCompoundTag();
$nbtLen = strlen($nbt);
if($nbtLen > 32767){
throw new \InvalidArgumentException("NBT encoded length must be < 32768, got $nbtLen bytes");
$nbt = "";
$nbtLen = 0;
if($item->hasNamedTag()){
if(self::$itemNbtSerializer === null){
self::$itemNbtSerializer = new LittleEndianNBTStream();
}
$nbt = self::$itemNbtSerializer->write($item->getNamedTag());
$nbtLen = strlen($nbt);
if($nbtLen > 32767){
throw new \InvalidArgumentException("NBT encoded length must be < 32768, got $nbtLen bytes");
}
}
$this->putLShort($nbtLen);