Merge pull request #3083 from PEMapModder/patch-5

Added Location::fromObject(Vector3, Level, yaw, pitch)
This commit is contained in:
Shoghi Cervantes 2015-05-30 17:11:40 +02:00
commit a349f6d4dd

View File

@ -21,6 +21,8 @@
namespace pocketmine\level;
use pocketmine\math\Vector3;
class Location extends Position{
public $yaw;
@ -43,6 +45,16 @@ class Location extends Position{
$this->level = $level;
}
/**
* @param Vector3 $pos
* @param Level|null $level default null
* @param float $yaw default 0.0
* @param float $pitch default 0.0
*/
public static function fromObject(Vector3 $pos, Level $level = null, $yaw = 0.0, $pitch = 0.0){
return new Location($pos->x, $pos->y, $pos->z, $yaw, $pitch, ($level === null) ? (($pos instanceof Position) ? $pos->level : null) : $level);
}
public function getYaw(){
return $this->yaw;
}