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

Merge branch '3.5'

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-01-20 15:53:47 +00:00
parent 467caf347d 47321114eb
commit ae7d6cc4a2
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/entity/object/ExperienceOrb.php
View File

@ -150,7 +150,7 @@ class ExperienceOrb extends Entity{
return null;
}
$entity = $this->server->getLevelManager()->findEntity($this->targetPlayerRuntimeId);
$entity = $this->level->getEntity($this->targetPlayerRuntimeId);
if($entity instanceof Human){
return $entity;
}
@ -159,7 +159,7 @@ class ExperienceOrb extends Entity{
}
public function setTargetPlayer(?Human $player) : void{
$this->targetPlayerRuntimeId = $player ? $player->getId() : null;
$this->targetPlayerRuntimeId = $player !== null ? $player->getId() : null;
}
public function entityBaseTick(int $tickDiff = 1) : bool{