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

add typehints to Metadatable interface and implementations, fix missing return for Block->hasMetadata() reported in #1285

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-08-10 18:02:01 +01:00
parent 82fd3b540e
commit e8bd0c3e09
6 changed files with 35 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pocketmine/block/Block.php
View File

@ -830,13 +830,13 @@ class Block extends Position implements BlockIds, Metadatable{
return MovingObjectPosition::fromBlock($this->x, $this->y, $this->z, $f, $vector->add($this->x, $this->y, $this->z));
}
public function setMetadata($metadataKey, MetadataValue $metadataValue){
public function setMetadata(string $metadataKey, MetadataValue $newMetadataValue){
if($this->getLevel() instanceof Level){
$this->getLevel()->getBlockMetadata()->setMetadata($this, $metadataKey, $metadataValue);
$this->getLevel()->getBlockMetadata()->setMetadata($this, $metadataKey, $newMetadataValue);
}
}
public function getMetadata($metadataKey){
public function getMetadata(string $metadataKey){
if($this->getLevel() instanceof Level){
return $this->getLevel()->getBlockMetadata()->getMetadata($this, $metadataKey);
}
@ -844,15 +844,17 @@ class Block extends Position implements BlockIds, Metadatable{
return null;
}
public function hasMetadata($metadataKey){
public function hasMetadata(string $metadataKey) : bool{
if($this->getLevel() instanceof Level){
$this->getLevel()->getBlockMetadata()->hasMetadata($this, $metadataKey);
return $this->getLevel()->getBlockMetadata()->hasMetadata($this, $metadataKey);
}
return false;
}
public function removeMetadata($metadataKey, Plugin $plugin){
public function removeMetadata(string $metadataKey, Plugin $owningPlugin){
if($this->getLevel() instanceof Level){
$this->getLevel()->getBlockMetadata()->removeMetadata($this, $metadataKey, $plugin);
$this->getLevel()->getBlockMetadata()->removeMetadata($this, $metadataKey, $owningPlugin);
}
}
}