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

LevelProvider: Remove cyclic dependency between Level and LevelProvider

Browse Source 
This will now allow LevelProviders to be constructed on threads.
This commit is contained in:
Dylan K. Taylor
2017-12-31 17:06:18 +00:00
parent d19683b7dd
commit 1a615591e2
5 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -343,7 +343,7 @@ class Level implements ChunkManager, Metadatable{
/** @var LevelProvider $provider */
if(is_subclass_of($provider, LevelProvider::class, true)){
$this->provider = new $provider($this, $path);
$this->provider = new $provider($path);
}else{
throw new LevelException("Provider is not a subclass of LevelProvider");
}
@ -2546,7 +2546,7 @@ class Level implements ChunkManager, Metadatable{
}
$this->timings->syncChunkSendPrepareTimer->startTiming();
$chunk = $this->provider->getChunk($x, $z, false);
$chunk = $this->provider->getChunk($x, $z);
if(!($chunk instanceof Chunk)){
throw new ChunkException("Invalid Chunk sent");
}
@ -2686,7 +2686,13 @@ class Level implements ChunkManager, Metadatable{
$this->cancelUnloadChunkRequest($x, $z);
$chunk = $this->provider->getChunk($x, $z, $generate);
$this->timings->syncChunkLoadDataTimer->startTiming();
$this->provider->loadChunk($x, $z, $generate);
$chunk = $this->provider->getChunk($x, $z);
$this->timings->syncChunkLoadDataTimer->stopTiming();
if($chunk === null){
if($generate){
throw new \InvalidStateException("Could not create new Chunk");