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

Clean up nonsensical code in NetworkBinaryStream->getSlot()

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-12-05 01:24:22 +00:00
parent 26155acff2
commit 6869ee1c2d
2 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,18 +238,15 @@ class NetworkBinaryStream extends BinaryStream{
if($nbt->hasTag(self::DAMAGE_TAG, IntTag::class)){
$meta = $nbt->getInt(self::DAMAGE_TAG);
$nbt->removeTag(self::DAMAGE_TAG);
if($nbt->count() === 0){
if(($conflicted = $nbt->getTag(self::DAMAGE_TAG_CONFLICT_RESOLUTION)) !== null){
$nbt->removeTag(self::DAMAGE_TAG_CONFLICT_RESOLUTION);
$conflicted->setName(self::DAMAGE_TAG);
$nbt->setTag($conflicted);
}elseif($nbt->count() === 0){
$nbt = null;
goto end;
}
}
if(($conflicted = $nbt->getTag(self::DAMAGE_TAG_CONFLICT_RESOLUTION)) !== null){
$nbt->removeTag(self::DAMAGE_TAG_CONFLICT_RESOLUTION);
$conflicted->setName(self::DAMAGE_TAG);
$nbt->setTag($conflicted);
}
}
end:
return ItemFactory::get($id, $meta, $cnt, $nbt);
}