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

Merge branch 'release/3.3'

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-09-23 16:45:22 +01:00
commit 3eca64e893
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pocketmine/level/Level.php
View File

@ -240,6 +240,9 @@ class Level implements ChunkManager, Metadatable{
/** @var int */ /** @var int */
public $tickRateCounter = 0; public $tickRateCounter = 0;
/** @var bool */
private $doingTick = false;
/** @var string|Generator */ /** @var string|Generator */
private $generator; private $generator;
@ -532,8 +535,12 @@ class Level implements ChunkManager, Metadatable{
* @param bool $force default false, force unload of default level * @param bool $force default false, force unload of default level
* *
* @return bool * @return bool
* @throws \InvalidStateException if trying to unload a level during level tick
*/ */
public function unload(bool $force = false) : bool{ public function unload(bool $force = false) : bool{
if($this->doingTick and !$force){
throw new \InvalidStateException("Cannot unload a level during level tick");
}
$ev = new LevelUnloadEvent($this); $ev = new LevelUnloadEvent($this);
@ -693,7 +700,16 @@ class Level implements ChunkManager, Metadatable{
} }
$this->timings->doTick->startTiming(); $this->timings->doTick->startTiming();
$this->doingTick = true;
try{
$this->actuallyDoTick($currentTick);
}finally{
$this->doingTick = false;
$this->timings->doTick->stopTiming();
}
}
protected function actuallyDoTick(int $currentTick) : void{
if(!$this->stopTime){ if(!$this->stopTime){
$this->time++; $this->time++;
} }
@ -819,8 +835,6 @@ class Level implements ChunkManager, Metadatable{
} }
$this->chunkPackets = []; $this->chunkPackets = [];
$this->timings->doTick->stopTiming();
} }
public function checkSleep(){ public function checkSleep(){