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

Merge changes from master

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-04-21 22:48:18 +01:00
parent 2204942338 de95046c11
commit 6ece57e23e
23 changed files with 79 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/entity/Entity.php
View File

@ -1110,7 +1110,7 @@ abstract class Entity extends Location implements Metadatable{
//return !($this instanceof Player);
}
public final function scheduleUpdate(){
final public function scheduleUpdate(){
$this->level->updateEntities[$this->id] = $this;
}

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

@ -100,7 +100,7 @@ abstract class Living extends Entity implements Damageable{
$this->namedtag->Health = new ShortTag("Health", $this->getHealth());
}
public abstract function getName();
abstract public function getName();
public function hasLineOfSight(Entity $entity){
//TODO: head height