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

Merge branch 'release/3.2'

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-08-25 18:37:27 +01:00
parent 4fb1f8dd76 032b20f659
commit 3b62926721
5 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -731,7 +731,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
public function getOwningEntity() : ?Entity{
$eid = $this->getOwningEntityId();
if($eid !== null){
return $this->server->findEntity($eid, $this->level);
return $this->server->findEntity($eid);
}
return null;
@@ -771,7 +771,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
public function getTargetEntity() : ?Entity{
$eid = $this->getTargetEntityId();
if($eid !== null){
return $this->server->findEntity($eid, $this->level);
return $this->server->findEntity($eid);
}
return null;

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

@@ -147,7 +147,7 @@ class ExperienceOrb extends Entity{
return null;
}
$entity = $this->server->findEntity($this->targetPlayerRuntimeId, $this->level);
$entity = $this->server->findEntity($this->targetPlayerRuntimeId);
if($entity instanceof Human){
return $entity;
}