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

Merge commit 'a0de9b0d4'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
This commit is contained in:
Dylan K. Taylor 2020-06-04 14:11:00 +01:00
commit 0a3bd6fe78
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/player/Player.php
View File

@ -213,8 +213,10 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
/** @var bool[] map: raw UUID (string) => bool */ /** @var bool[] map: raw UUID (string) => bool */
protected $hiddenPlayers = []; protected $hiddenPlayers = [];
/** @var int */ /** @var float */
protected $moveRateLimit = 10 * self::MOVES_PER_TICK; protected $moveRateLimit = 10 * self::MOVES_PER_TICK;
/** @var float|null */
protected $lastMovementProcess = null;
/** @var Vector3|null */ /** @var Vector3|null */
protected $forceMoveSync = null; protected $forceMoveSync = null;
@ -1238,8 +1240,11 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
* Fires movement events and synchronizes player movement, every tick. * Fires movement events and synchronizes player movement, every tick.
*/ */
protected function processMostRecentMovements() : void{ protected function processMostRecentMovements() : void{
$now = microtime(true);
$multiplier = $this->lastMovementProcess !== null ? ($now - $this->lastMovementProcess) * 20 : 1;
$exceededRateLimit = $this->moveRateLimit < 0; $exceededRateLimit = $this->moveRateLimit < 0;
$this->moveRateLimit = min(self::MOVE_BACKLOG_SIZE, max(0, $this->moveRateLimit) + self::MOVES_PER_TICK); $this->moveRateLimit = min(self::MOVE_BACKLOG_SIZE, max(0, $this->moveRateLimit) + self::MOVES_PER_TICK * $multiplier);
$this->lastMovementProcess = $now;
$from = clone $this->lastLocation; $from = clone $this->lastLocation;
$to = clone $this->location; $to = clone $this->location;