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

Bump to API 3.0.0-ALPHA2 - READ DESCRIPTION!

Browse Source 
Refactored level\format\generic\GenericChunk -> level\format\Chunk.
Re-added support for async chunk sending
Refactored most Level IO into new namespaces for more organisation
Removed LevelDB loader completely (will be re-added at a later date)
This commit is contained in:
Dylan K. Taylor
2017-01-06 17:13:45 +00:00
parent d8908676ac
commit ad0553fbf8
23 changed files with 795 additions and 1952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/pocketmine/level/generator/GenerationTask.php
View File

@ -22,7 +22,6 @@
namespace pocketmine\level\generator;
use pocketmine\level\format\Chunk;
use pocketmine\level\format\generic\GenericChunk;
use pocketmine\level\Level;
use pocketmine\level\SimpleChunkManager;
use pocketmine\scheduler\AsyncTask;
@ -51,7 +50,7 @@ class GenerationTask extends AsyncTask{
}
/** @var Chunk $chunk */
$chunk = GenericChunk::fastDeserialize($this->chunk);
$chunk = Chunk::fastDeserialize($this->chunk);
if($chunk === null){
//TODO error
return;
@ -76,7 +75,7 @@ class GenerationTask extends AsyncTask{
return;
}
/** @var Chunk $chunk */
$chunk = GenericChunk::fastDeserialize($this->chunk, $level->getProvider());
$chunk = Chunk::fastDeserialize($this->chunk, $level->getProvider());
if($chunk === null){
//TODO error
return;

5
src/pocketmine/level/generator/LightPopulationTask.php
View File

@ -22,7 +22,6 @@
namespace pocketmine\level\generator;
use pocketmine\level\format\Chunk;
use pocketmine\level\format\generic\GenericChunk;
use pocketmine\level\Level;
use pocketmine\scheduler\AsyncTask;
use pocketmine\Server;
@ -39,7 +38,7 @@ class LightPopulationTask extends AsyncTask{
public function onRun(){
/** @var Chunk $chunk */
$chunk = GenericChunk::fastDeserialize($this->chunk);
$chunk = Chunk::fastDeserialize($this->chunk);
if($chunk === null){
//TODO error
return;
@ -56,7 +55,7 @@ class LightPopulationTask extends AsyncTask{
$level = $server->getLevel($this->levelId);
if($level !== null){
/** @var Chunk $chunk */
$chunk = GenericChunk::fastDeserialize($this->chunk, $level->getProvider());
$chunk = Chunk::fastDeserialize($this->chunk, $level->getProvider());
if($chunk === null){
//TODO error
return;

11
src/pocketmine/level/generator/PopulationTask.php
View File

@ -22,7 +22,6 @@
namespace pocketmine\level\generator;
use pocketmine\level\format\Chunk;
use pocketmine\level\format\generic\GenericChunk;
use pocketmine\level\Level;
use pocketmine\level\SimpleChunkManager;
use pocketmine\scheduler\AsyncTask;
@ -73,7 +72,7 @@ class PopulationTask extends AsyncTask{
/** @var Chunk[] $chunks */
$chunks = [];
$chunk = GenericChunk::fastDeserialize($this->chunk);
$chunk = Chunk::fastDeserialize($this->chunk);
for($i = 0; $i < 9; ++$i){
if($i === 4){
@ -83,9 +82,9 @@ class PopulationTask extends AsyncTask{
$zz = -1 + (int) ($i / 3);
$ck = $this->{"chunk$i"};
if($ck === null){
$chunks[$i] = GenericChunk::getEmptyChunk($chunk->getX() + $xx, $chunk->getZ() + $zz);
$chunks[$i] = Chunk::getEmptyChunk($chunk->getX() + $xx, $chunk->getZ() + $zz);
}else{
$chunks[$i] = GenericChunk::fastDeserialize($ck);
$chunks[$i] = Chunk::fastDeserialize($ck);
}
}
@ -153,7 +152,7 @@ class PopulationTask extends AsyncTask{
return;
}
$chunk = GenericChunk::fastDeserialize($this->chunk, $level->getProvider());
$chunk = Chunk::fastDeserialize($this->chunk, $level->getProvider());
if($chunk === null){
//TODO error
@ -166,7 +165,7 @@ class PopulationTask extends AsyncTask{
}
$c = $this->{"chunk$i"};
if($c !== null){
$c = GenericChunk::fastDeserialize($c, $level->getProvider());
$c = Chunk::fastDeserialize($c, $level->getProvider());
$level->generateChunkCallback($c->getX(), $c->getZ(), $c);
}
}