mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-20 15:41:33 +00:00
Code Issues Projects Releases Wiki Activity

Remove all usages of CompoundTag->hasTag()

Browse Source 
in pretty much every case, these usages really wanted to read the tag's contents anyway, which can be combined with a getTag() and instanceof call for more concise and static analysis friendly code.
In the few cases where the tag contents wasn't needed, it still wanted to check the type, which, again, can be done in a more static analysis friendly way by just using getTag() and instanceof.
This commit is contained in:
Dylan K. Taylor
2020-07-10 21:01:43 +01:00
parent 91b028c208
commit 279abb871d
27 changed files with 94 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/entity/Entity.php
View File

@@ -481,12 +481,12 @@ abstract class Entity{
$this->fallDistance = $nbt->getFloat("FallDistance", 0.0);
if($nbt->hasTag("CustomName", StringTag::class)){
$this->setNameTag($nbt->getString("CustomName"));
if(($customNameTag = $nbt->getTag("CustomName")) instanceof StringTag){
$this->setNameTag($customNameTag->getValue());
if($nbt->hasTag("CustomNameVisible", StringTag::class)){
if(($customNameVisibleTag = $nbt->getTag("CustomNameVisible")) instanceof StringTag){
//Older versions incorrectly saved this as a string (see 890f72dbf23a77f294169b79590770470041adc4)
$this->setNameTagVisible($nbt->getString("CustomNameVisible") !== "");
$this->setNameTagVisible($customNameVisibleTag->getValue() !== "");
}else{
$this->setNameTagVisible($nbt->getByte("CustomNameVisible", 1) !== 0);
}