From d19683b7dd6661adc4de2ee46f587c672bd26b9c Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sun, 31 Dec 2017 16:28:19 +0000 Subject: [PATCH] LevelProvider: Remove some dead methods --- .../level/format/io/BaseLevelProvider.php | 17 --------------- .../level/format/io/LevelProvider.php | 21 ------------------- .../level/format/io/leveldb/LevelDB.php | 4 ---- .../level/format/io/region/McRegion.php | 8 ------- 4 files changed, 50 deletions(-) diff --git a/src/pocketmine/level/format/io/BaseLevelProvider.php b/src/pocketmine/level/format/io/BaseLevelProvider.php index 962910120..84d5c4dab 100644 --- a/src/pocketmine/level/format/io/BaseLevelProvider.php +++ b/src/pocketmine/level/format/io/BaseLevelProvider.php @@ -70,14 +70,6 @@ abstract class BaseLevelProvider implements LevelProvider{ return $this->path; } - public function getServer(){ - return $this->level->getServer(); - } - - public function getLevel() : Level{ - return $this->level; - } - public function getName() : string{ return $this->levelData->getString("LevelName"); } @@ -217,15 +209,6 @@ abstract class BaseLevelProvider implements LevelProvider{ $this->chunks = []; } - public function isChunkPopulated(int $chunkX, int $chunkZ) : bool{ - $chunk = $this->getChunk($chunkX, $chunkZ); - if($chunk !== null){ - return $chunk->isPopulated(); - }else{ - return false; - } - } - abstract protected function readChunk(int $chunkX, int $chunkZ) : ?Chunk; abstract protected function writeChunk(Chunk $chunk) : void; diff --git a/src/pocketmine/level/format/io/LevelProvider.php b/src/pocketmine/level/format/io/LevelProvider.php index bdc3a75c4..d6a9054bc 100644 --- a/src/pocketmine/level/format/io/LevelProvider.php +++ b/src/pocketmine/level/format/io/LevelProvider.php @@ -144,22 +144,6 @@ interface LevelProvider{ */ public function isChunkLoaded(int $chunkX, int $chunkZ) : bool; - /** - * @param int $chunkX - * @param int $chunkZ - * - * @return bool - */ - public function isChunkGenerated(int $chunkX, int $chunkZ) : bool; - - /** - * @param int $chunkX - * @param int $chunkZ - * - * @return bool - */ - public function isChunkPopulated(int $chunkX, int $chunkZ) : bool; - /** * @return string */ @@ -214,11 +198,6 @@ interface LevelProvider{ public function doGarbageCollection(); - /** - * @return Level - */ - public function getLevel() : Level; - public function close(); } diff --git a/src/pocketmine/level/format/io/leveldb/LevelDB.php b/src/pocketmine/level/format/io/leveldb/LevelDB.php index a597be7fc..89cac8293 100644 --- a/src/pocketmine/level/format/io/leveldb/LevelDB.php +++ b/src/pocketmine/level/format/io/leveldb/LevelDB.php @@ -527,10 +527,6 @@ class LevelDB extends BaseLevelProvider{ return $this->db->get(LevelDB::chunkIndex($chunkX, $chunkZ) . self::TAG_VERSION) !== false; } - public function isChunkGenerated(int $chunkX, int $chunkZ) : bool{ - return $this->chunkExists($chunkX, $chunkZ) and ($chunk = $this->getChunk($chunkX, $chunkZ, false)) !== null; - } - public function close(){ $this->unloadChunks(); $this->db->close(); diff --git a/src/pocketmine/level/format/io/region/McRegion.php b/src/pocketmine/level/format/io/region/McRegion.php index d0eccb1d4..a6d153f95 100644 --- a/src/pocketmine/level/format/io/region/McRegion.php +++ b/src/pocketmine/level/format/io/region/McRegion.php @@ -280,14 +280,6 @@ class McRegion extends BaseLevelProvider{ $this->levelData->setByte("Difficulty", $difficulty); } - public function isChunkGenerated(int $chunkX, int $chunkZ) : bool{ - if(($region = $this->getRegion($chunkX >> 5, $chunkZ >> 5)) !== null){ - return $region->chunkExists($chunkX & 0x1f, $chunkZ & 0x1f) and $this->getChunk($chunkX & 0x1f, $chunkZ & 0x1f, true)->isGenerated(); - } - - return false; - } - public function doGarbageCollection(){ $limit = time() - 300; foreach($this->regions as $index => $region){