Merge branch 'stable'

# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
This commit is contained in:
Dylan K. Taylor 2020-07-09 12:37:50 +01:00
commit 9e1d9768f0

View File

@ -2212,6 +2212,9 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
$this->resetFallDistance(); $this->resetFallDistance();
$this->nextChunkOrderRun = 0; $this->nextChunkOrderRun = 0;
if($this->spawnChunkLoadCount !== -1){
$this->spawnChunkLoadCount = 0;
}
$this->stopSleep(); $this->stopSleep();
$this->blockBreakHandler = null; $this->blockBreakHandler = null;