Merge branch '3.5'

This commit is contained in:
Dylan K. Taylor 2019-01-06 01:09:34 +00:00
commit f0733f6ab6

View File

@ -2679,10 +2679,9 @@ class Server{
TimingsHandler::tick($this->currentTPS <= $this->profilingTickRate); TimingsHandler::tick($this->currentTPS <= $this->profilingTickRate);
array_shift($this->tickAverage); $idx = $this->tickCounter % 20;
$this->tickAverage[] = $this->currentTPS; $this->tickAverage[$idx] = $this->currentTPS;
array_shift($this->useAverage); $this->useAverage[$idx] = $this->currentUse;
$this->useAverage[] = $this->currentUse;
if(($this->nextTick - $tickTime) < -1){ if(($this->nextTick - $tickTime) < -1){
$this->nextTick = $tickTime; $this->nextTick = $tickTime;