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

Typehinted up entity API

Browse Source 
Did you guys think ALPHA7 changes were done?!
Sone stuff still needs some work, most notably data-properties can't be typed yet because they are just mushed into a couple of methods.
This commit is contained in:
Dylan K. Taylor
2017-08-16 19:03:39 +01:00
parent ea414ea72d
commit 741394dab1
23 changed files with 197 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pocketmine/entity/Living.php
View File

@ -57,7 +57,7 @@ abstract class Living extends Entity implements Damageable{
/** @var Effect[] */
protected $effects = [];
abstract public function getName();
abstract public function getName() : string;
protected function initEntity(){
parent::initEntity();
@ -151,7 +151,7 @@ abstract class Living extends Entity implements Damageable{
}
public function hasLineOfSight(Entity $entity){
public function hasLineOfSight(Entity $entity) : bool{
//TODO: head height
return true;
//return $this->getLevel()->rayTraceBlocks(Vector3::createVector($this->x, $this->y + $this->height, $this->z), Vector3::createVector($entity->x, $entity->y + $entity->height, $entity->z)) === null;
@ -377,7 +377,7 @@ abstract class Living extends Entity implements Damageable{
$this->attackTime = 10; //0.5 seconds cooldown
}
public function knockBack(Entity $attacker, $damage, $x, $z, $base = 0.4){
public function knockBack(Entity $attacker, float $damage, float $x, float $z, float $base = 0.4){
$f = sqrt($x * $x + $z * $z);
if($f <= 0){
return;
@ -416,7 +416,7 @@ abstract class Living extends Entity implements Damageable{
}
}
public function entityBaseTick($tickDiff = 1){
public function entityBaseTick(int $tickDiff = 1) : bool{
Timings::$timerLivingEntityBaseTick->startTiming();
$this->setDataFlag(self::DATA_FLAGS, self::DATA_FLAG_BREATHING, !$this->isInsideOfWater());
@ -505,7 +505,7 @@ abstract class Living extends Entity implements Damageable{
*
* @return Block[]
*/
public function getLineOfSight($maxDistance, $maxLength = 0, array $transparent = []){
public function getLineOfSight(int $maxDistance, int $maxLength = 0, array $transparent = []) : array{
if($maxDistance > 120){
$maxDistance = 120;
}
@ -551,7 +551,7 @@ abstract class Living extends Entity implements Damageable{
*
* @return Block|null
*/
public function getTargetBlock($maxDistance, array $transparent = []){
public function getTargetBlock(int $maxDistance, array $transparent = []){
try{
$block = $this->getLineOfSight($maxDistance, 1, $transparent)[0];
if($block instanceof Block){