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

BaseLevelProvider: Remove obsolete proxy methods

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-04-15 15:15:16 +01:00
parent be190fc41b
commit e6fb6b1f27
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
3 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/world/format/io/BaseWorldProvider.php
View File

@ -23,8 +23,6 @@ declare(strict_types=1);
namespace pocketmine\world\format\io; namespace pocketmine\world\format\io;
use pocketmine\world\format\Chunk;
use pocketmine\world\format\io\exception\CorruptedChunkException;
use pocketmine\world\format\io\exception\CorruptedWorldException; use pocketmine\world\format\io\exception\CorruptedWorldException;
use pocketmine\world\format\io\exception\UnsupportedWorldFormatException; use pocketmine\world\format\io\exception\UnsupportedWorldFormatException;
use pocketmine\world\WorldException; use pocketmine\world\WorldException;
@ -58,22 +56,4 @@ abstract class BaseWorldProvider implements WorldProvider{
public function getWorldData() : WorldData{ public function getWorldData() : WorldData{
return $this->worldData; return $this->worldData;
} }
/**
* @throws CorruptedChunkException
*/
public function loadChunk(int $chunkX, int $chunkZ) : ?Chunk{
return $this->readChunk($chunkX, $chunkZ);
}
public function saveChunk(int $chunkX, int $chunkZ, Chunk $chunk) : void{
$this->writeChunk($chunkX, $chunkZ, $chunk);
}
/**
* @throws CorruptedChunkException
*/
abstract protected function readChunk(int $chunkX, int $chunkZ) : ?Chunk;
abstract protected function writeChunk(int $chunkX, int $chunkZ, Chunk $chunk) : void;
} }

4
src/world/format/io/leveldb/LevelDB.php
View File

@ -230,7 +230,7 @@ class LevelDB extends BaseWorldProvider implements WritableWorldProvider{
/** /**
* @throws CorruptedChunkException * @throws CorruptedChunkException
*/ */
protected function readChunk(int $chunkX, int $chunkZ) : ?Chunk{ public function loadChunk(int $chunkX, int $chunkZ) : ?Chunk{
$index = LevelDB::chunkIndex($chunkX, $chunkZ); $index = LevelDB::chunkIndex($chunkX, $chunkZ);
$chunkVersionRaw = $this->db->get($index . self::TAG_VERSION); $chunkVersionRaw = $this->db->get($index . self::TAG_VERSION);
@ -418,7 +418,7 @@ class LevelDB extends BaseWorldProvider implements WritableWorldProvider{
return $chunk; return $chunk;
} }
protected function writeChunk(int $chunkX, int $chunkZ, Chunk $chunk) : void{ public function saveChunk(int $chunkX, int $chunkZ, Chunk $chunk) : void{
$idMap = LegacyBlockIdToStringIdMap::getInstance(); $idMap = LegacyBlockIdToStringIdMap::getInstance();
$index = LevelDB::chunkIndex($chunkX, $chunkZ); $index = LevelDB::chunkIndex($chunkX, $chunkZ);

4
src/world/format/io/region/RegionWorldProvider.php
View File

@ -207,7 +207,7 @@ abstract class RegionWorldProvider extends BaseWorldProvider{
/** /**
* @throws CorruptedChunkException * @throws CorruptedChunkException
*/ */
protected function readChunk(int $chunkX, int $chunkZ) : ?Chunk{ public function loadChunk(int $chunkX, int $chunkZ) : ?Chunk{
$regionX = $regionZ = null; $regionX = $regionZ = null;
self::getRegionIndex($chunkX, $chunkZ, $regionX, $regionZ); self::getRegionIndex($chunkX, $chunkZ, $regionX, $regionZ);
assert(is_int($regionX) and is_int($regionZ)); assert(is_int($regionX) and is_int($regionZ));
@ -224,7 +224,7 @@ abstract class RegionWorldProvider extends BaseWorldProvider{
return null; return null;
} }
protected function writeChunk(int $chunkX, int $chunkZ, Chunk $chunk) : void{ public function saveChunk(int $chunkX, int $chunkZ, Chunk $chunk) : void{
self::getRegionIndex($chunkX, $chunkZ, $regionX, $regionZ); self::getRegionIndex($chunkX, $chunkZ, $regionX, $regionZ);
$this->loadRegion($regionX, $regionZ)->writeChunk($chunkX & 0x1f, $chunkZ & 0x1f, $this->serializeChunk($chunk)); $this->loadRegion($regionX, $regionZ)->writeChunk($chunkX & 0x1f, $chunkZ & 0x1f, $this->serializeChunk($chunk));
} }