diff --git a/src/Player.php b/src/Player.php index 39acca79..a68892a7 100644 --- a/src/Player.php +++ b/src/Player.php @@ -188,7 +188,10 @@ class Player{ } if($repeat === false){ - $this->getNextChunk(true); + $r = (int) ((PLAYER_CHUNKS_PER_SECOND - 20) / 20); + for($i = 0; $i < $r; ++$i){ + $this->getNextChunk(true); + } } $this->server->schedule(1, array($this, "getNextChunk")); @@ -1152,7 +1155,7 @@ class Player{ } if(($this->entity instanceof Entity) and $data["counter"] > $this->lastMovement){ $this->lastMovement = $data["counter"]; - $speed = $this->entity->speed; + $speed = $this->entity->getSpeedMeasure(); if($this->blocked === true or ($this->server->api->getProperty("allow-flight") !== true and (($speed > 7 and ($this->gamemode & 0x01) === 0x00) or $speed > 15)) or $this->server->api->handle("player.move", $this->entity) === false){ if($this->lastCorrect instanceof Vector3){ $this->teleport($this->lastCorrect, $this->entity->yaw, $this->entity->pitch, false); diff --git a/src/PocketMinecraftServer.php b/src/PocketMinecraftServer.php index 49deef2f..e9d4b929 100644 --- a/src/PocketMinecraftServer.php +++ b/src/PocketMinecraftServer.php @@ -175,7 +175,7 @@ class PocketMinecraftServer{ return $info; } - public function close($reason = "stop"){ + public function close($reason = "server stop"){ if($this->stop !== true){ if(is_int($reason)){ $reason = "signal stop"; diff --git a/src/constants/GeneralConstants.php b/src/constants/GeneralConstants.php index b15a939e..3c9a61b1 100644 --- a/src/constants/GeneralConstants.php +++ b/src/constants/GeneralConstants.php @@ -37,6 +37,7 @@ define("VIEWER", 3); //Players +define("PLAYER_CHUNKS_PER_SECOND", 60); define("PLAYER_RECOVERY_BUFFER", 1024); define("PLAYER_MAX_PACKET_LOSS", 0.20); diff --git a/src/world/Entity.php b/src/world/Entity.php index 595e731f..2d15843d 100644 --- a/src/world/Entity.php +++ b/src/world/Entity.php @@ -52,7 +52,7 @@ class Entity extends Position{ public $fallY; public $fallStart; private $tickCounter; - private $speedMeasure = array(0, 0, 0, 0, 0); + private $speedMeasure = array(0, 0, 0); private $server; private $isStatic; public $level; @@ -778,7 +778,7 @@ class Entity extends Position{ } public function resetSpeed(){ - $this->speedMeasure = array(0, 0, 0, 0, 0); + $this->speedMeasure = array(0, 0, 0); } public function getSpeed(){