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

Entity: harden setRotation(), setMotion(), addMotion() and teleport() against NaN/INF values

Browse Source
This commit is contained in:
Dylan K. Taylor 2022-03-09 22:36:44 +00:00
parent 1e88412a8f
commit 5c0eb92d81
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/entity/Entity.php
View File

@ -1324,6 +1324,8 @@ abstract class Entity{
} }
public function setRotation(float $yaw, float $pitch) : void{ public function setRotation(float $yaw, float $pitch) : void{
Utils::checkFloatNotInfOrNaN("yaw", $yaw);
Utils::checkFloatNotInfOrNaN("pitch", $pitch);
$this->location->yaw = $yaw; $this->location->yaw = $yaw;
$this->location->pitch = $pitch; $this->location->pitch = $pitch;
$this->scheduleUpdate(); $this->scheduleUpdate();
@ -1349,6 +1351,7 @@ abstract class Entity{
} }
public function setMotion(Vector3 $motion) : bool{ public function setMotion(Vector3 $motion) : bool{
Utils::checkVector3NotInfOrNaN($motion);
if(!$this->justCreated){ if(!$this->justCreated){
$ev = new EntityMotionEvent($this, $motion); $ev = new EntityMotionEvent($this, $motion);
$ev->call(); $ev->call();
@ -1370,6 +1373,9 @@ abstract class Entity{
* Adds the given values to the entity's motion vector. * Adds the given values to the entity's motion vector.
*/ */
public function addMotion(float $x, float $y, float $z) : void{ public function addMotion(float $x, float $y, float $z) : void{
Utils::checkFloatNotInfOrNaN("x", $x);
Utils::checkFloatNotInfOrNaN("y", $y);
Utils::checkFloatNotInfOrNaN("z", $z);
$this->motion = $this->motion->add($x, $y, $z); $this->motion = $this->motion->add($x, $y, $z);
} }
@ -1381,10 +1387,18 @@ abstract class Entity{
* @param Vector3|Position|Location $pos * @param Vector3|Position|Location $pos
*/ */
public function teleport(Vector3 $pos, ?float $yaw = null, ?float $pitch = null) : bool{ public function teleport(Vector3 $pos, ?float $yaw = null, ?float $pitch = null) : bool{
Utils::checkVector3NotInfOrNaN($pos);
if($pos instanceof Location){ if($pos instanceof Location){
$yaw = $yaw ?? $pos->yaw; $yaw = $yaw ?? $pos->yaw;
$pitch = $pitch ?? $pos->pitch; $pitch = $pitch ?? $pos->pitch;
} }
if($yaw !== null){
Utils::checkFloatNotInfOrNaN("yaw", $yaw);
}
if($pitch !== null){
Utils::checkFloatNotInfOrNaN("pitch", $pitch);
}
$from = $this->location->asPosition(); $from = $this->location->asPosition();
$to = Position::fromObject($pos, $pos instanceof Position ? $pos->getWorld() : $this->getWorld()); $to = Position::fromObject($pos, $pos instanceof Position ? $pos->getWorld() : $this->getWorld());
$ev = new EntityTeleportEvent($this, $from, $to); $ev = new EntityTeleportEvent($this, $from, $to);