mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-03 16:49:53 +00:00
Code Issues Projects Releases Wiki Activity

TypeConverter: avoid repeated calls to getId() and getMeta()

Browse Source
This commit is contained in:
Dylan K. Taylor 2023-04-18 15:02:52 +01:00
parent 6102740ee3
commit a77fc8109f
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/network/mcpe/convert/TypeConverter.php
View File

@ -143,7 +143,9 @@ class TypeConverter{
$nbt = clone $nbt; $nbt = clone $nbt;
} }
$idMeta = ItemTranslator::getInstance()->toNetworkIdQuiet($itemStack->getId(), $itemStack->getMeta()); $internalId = $itemStack->getId();
$internalMeta = $itemStack->getMeta();
$idMeta = ItemTranslator::getInstance()->toNetworkIdQuiet($internalId, $internalMeta);
if($idMeta === null){ if($idMeta === null){
//Display unmapped items as INFO_UPDATE, but stick something in their NBT to make sure they don't stack with //Display unmapped items as INFO_UPDATE, but stick something in their NBT to make sure they don't stack with
//other unmapped items. //other unmapped items.
@ -151,8 +153,8 @@ class TypeConverter{
if($nbt === null){ if($nbt === null){
$nbt = new CompoundTag(); $nbt = new CompoundTag();
} }
$nbt->setInt(self::PM_ID_TAG, $itemStack->getId()); $nbt->setInt(self::PM_ID_TAG, $internalId);
$nbt->setInt(self::PM_META_TAG, $itemStack->getMeta()); $nbt->setInt(self::PM_META_TAG, $internalMeta);
}else{ }else{
[$id, $meta] = $idMeta; [$id, $meta] = $idMeta;
@ -171,7 +173,7 @@ class TypeConverter{
} }
$blockRuntimeId = 0; $blockRuntimeId = 0;
if($itemStack->getId() < 256){ if($internalId < 256){
$block = $itemStack->getBlock(); $block = $itemStack->getBlock();
if($block->getId() !== BlockLegacyIds::AIR){ if($block->getId() !== BlockLegacyIds::AIR){
$blockRuntimeId = RuntimeBlockMapping::getInstance()->toRuntimeId($block->getFullId()); $blockRuntimeId = RuntimeBlockMapping::getInstance()->toRuntimeId($block->getFullId());