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

Improve checks for Position::equals() and Location::equals() (#929)

Browse Source 
* Add files via upload

* Position::$level can be null.

* Use getLevel() in place of $level

because of WeakPosition.
This commit is contained in:
Muqsit Rayyan 2017-07-04 22:25:25 +03:00 committed by Dylan K. Taylor
parent 1a6517ea4e
commit b8a30309bb
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pocketmine/level/Location.php
View File

@ -79,4 +79,11 @@ class Location extends Position{
public function __toString(){ public function __toString(){
return "Location (level=" . ($this->isValid() ? $this->getLevel()->getName() : "null") . ", x=$this->x, y=$this->y, z=$this->z, yaw=$this->yaw, pitch=$this->pitch)"; return "Location (level=" . ($this->isValid() ? $this->getLevel()->getName() : "null") . ", x=$this->x, y=$this->y, z=$this->z, yaw=$this->yaw, pitch=$this->pitch)";
} }
public function equals(Vector3 $v){
if($v instanceof Location){
return parent::equals($v) and $v->yaw == $this->yaw and $v->pitch == $this->pitch;
}
return parent::equals($v);
}
} }

6
src/pocketmine/level/Position.php
View File

@ -133,4 +133,10 @@ class Position extends Vector3{
return $this; return $this;
} }
public function equals(Vector3 $v){
if($v instanceof Position){
return parent::equals($v) and $v->getLevel() === $this->getLevel();
}
return parent::equals($v);
}
} }