diff --git a/src/pocketmine/world/World.php b/src/pocketmine/world/World.php index 215882257c..2472868b6d 100644 --- a/src/pocketmine/world/World.php +++ b/src/pocketmine/world/World.php @@ -72,7 +72,6 @@ use pocketmine\world\biome\Biome; use pocketmine\world\format\Chunk; use pocketmine\world\format\EmptySubChunk; use pocketmine\world\format\io\exception\CorruptedChunkException; -use pocketmine\world\format\io\exception\UnsupportedChunkFormatException; use pocketmine\world\format\io\WritableWorldProvider; use pocketmine\world\generator\Generator; use pocketmine\world\generator\GeneratorManager; @@ -2506,7 +2505,7 @@ class World implements ChunkManager, Metadatable{ try{ $chunk = $this->provider->loadChunk($x, $z); - }catch(CorruptedChunkException | UnsupportedChunkFormatException $e){ + }catch(CorruptedChunkException $e){ $this->logger->critical("Failed to load chunk x=$x z=$z: " . $e->getMessage()); } diff --git a/src/pocketmine/world/format/io/BaseWorldProvider.php b/src/pocketmine/world/format/io/BaseWorldProvider.php index 890e78d81c..2689d0f6c6 100644 --- a/src/pocketmine/world/format/io/BaseWorldProvider.php +++ b/src/pocketmine/world/format/io/BaseWorldProvider.php @@ -26,7 +26,6 @@ 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\UnsupportedChunkFormatException; use pocketmine\world\format\io\exception\UnsupportedWorldFormatException; use pocketmine\world\WorldException; use function file_exists; @@ -70,7 +69,6 @@ abstract class BaseWorldProvider implements WorldProvider{ * * @return Chunk|null * @throws CorruptedChunkException - * @throws UnsupportedChunkFormatException */ public function loadChunk(int $chunkX, int $chunkZ) : ?Chunk{ return $this->readChunk($chunkX, $chunkZ); @@ -88,7 +86,6 @@ abstract class BaseWorldProvider implements WorldProvider{ * @param int $chunkZ * * @return Chunk|null - * @throws UnsupportedChunkFormatException * @throws CorruptedChunkException */ abstract protected function readChunk(int $chunkX, int $chunkZ) : ?Chunk; diff --git a/src/pocketmine/world/format/io/WorldProvider.php b/src/pocketmine/world/format/io/WorldProvider.php index 71cebcaae3..122aca55fa 100644 --- a/src/pocketmine/world/format/io/WorldProvider.php +++ b/src/pocketmine/world/format/io/WorldProvider.php @@ -26,7 +26,6 @@ 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\UnsupportedChunkFormatException; use pocketmine\world\format\io\exception\UnsupportedWorldFormatException; interface WorldProvider{ @@ -69,7 +68,6 @@ interface WorldProvider{ * @return null|Chunk * * @throws CorruptedChunkException - * @throws UnsupportedChunkFormatException */ public function loadChunk(int $chunkX, int $chunkZ) : ?Chunk; diff --git a/src/pocketmine/world/format/io/exception/UnsupportedChunkFormatException.php b/src/pocketmine/world/format/io/exception/UnsupportedChunkFormatException.php deleted file mode 100644 index 3694c9f46d..0000000000 --- a/src/pocketmine/world/format/io/exception/UnsupportedChunkFormatException.php +++ /dev/null @@ -1,30 +0,0 @@ -