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

Don't handle NAN/INF in movements

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-03-23 14:53:53 +00:00
parent 3333df31df
commit fb20bb3832
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/pocketmine/Player.php
View File

@ -196,7 +196,9 @@ use function get_class;
use function gettype; use function gettype;
use function implode; use function implode;
use function in_array; use function in_array;
use function is_infinite;
use function is_int; use function is_int;
use function is_nan;
use function is_object; use function is_object;
use function is_string; use function is_string;
use function json_encode; use function json_encode;
@ -2357,8 +2359,15 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
} }
public function handleMovePlayer(MovePlayerPacket $packet) : bool{ public function handleMovePlayer(MovePlayerPacket $packet) : bool{
$newPos = $packet->position->round(4)->subtract(0, $this->baseOffset, 0); $rawPos = $packet->position;
foreach([$rawPos->x, $rawPos->y, $rawPos->z, $packet->yaw, $packet->headYaw, $packet->pitch] as $float){
if(is_infinite($float) || is_nan($float)){
$this->server->getLogger()->debug("Invalid movement from " . $this->getName() . ", contains NAN/INF components");
return false;
}
}
$newPos = $rawPos->round(4)->subtract(0, $this->baseOffset, 0);
if($this->forceMoveSync !== null and $newPos->distanceSquared($this->forceMoveSync) > 1){ //Tolerate up to 1 block to avoid problems with client-sided physics when spawning in blocks if($this->forceMoveSync !== null and $newPos->distanceSquared($this->forceMoveSync) > 1){ //Tolerate up to 1 block to avoid problems with client-sided physics when spawning in blocks
$this->server->getLogger()->debug("Got outdated pre-teleport movement from " . $this->getName() . ", received " . $newPos . ", expected " . $this->asVector3()); $this->server->getLogger()->debug("Got outdated pre-teleport movement from " . $this->getName() . ", received " . $newPos . ", expected " . $this->asVector3());
//Still getting movements from before teleport, ignore them //Still getting movements from before teleport, ignore them