mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-08-31 15:31:07 +00:00
Code Issues Projects Releases Wiki Activity

RegionLoader: make some error messages more detailed

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-03-05 11:18:02 +00:00
parent 6f5d4d6b80
commit 55994e08db
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/pocketmine/level/format/io/region/RegionLoader.php
View File

@ -142,13 +142,13 @@ class RegionLoader{
if($length >= self::MAX_SECTOR_LENGTH){ if($length >= self::MAX_SECTOR_LENGTH){
$this->locationTable[$index][0] = ++$this->lastSector; $this->locationTable[$index][0] = ++$this->lastSector;
$this->locationTable[$index][1] = 1; $this->locationTable[$index][1] = 1;
throw new CorruptedChunkException("Corrupted chunk header detected (sector count larger than max)"); throw new CorruptedChunkException("Corrupted chunk header detected (sector count $length larger than max " . self::MAX_SECTOR_LENGTH . ")");
} }
return null; return null;
} }
if($length > ($this->locationTable[$index][1] << 12)){ //Invalid chunk, bigger than defined number of sectors if($length > ($this->locationTable[$index][1] << 12)){ //Invalid chunk, bigger than defined number of sectors
MainLogger::getLogger()->error("Corrupted bigger chunk detected (bigger than number of sectors given in header)"); MainLogger::getLogger()->error("Chunk x=$x,z=$z length mismatch (expected " . ($this->locationTable[$index][1] << 12) . " sectors, got $length sectors)");
$this->locationTable[$index][1] = $length >> 12; $this->locationTable[$index][1] = $length >> 12;
$this->writeLocationIndex($index); $this->writeLocationIndex($index);
} }
@ -240,6 +240,16 @@ class RegionLoader{
return $x | ($z << 5); return $x | ($z << 5);
} }
/**
* @param int $offset
* @param int &$x
* @param int &$z
*/
protected static function getChunkCoords(int $offset, ?int &$x, ?int &$z) : void{
$x = $offset & 0x1f;
$z = ($offset >> 5) & 0x1f;
}
/** /**
* Writes the region header and closes the file * Writes the region header and closes the file
* *
@ -265,18 +275,23 @@ class RegionLoader{
} }
$data = unpack("N*", $headerRaw); $data = unpack("N*", $headerRaw);
/** @var int[] $usedOffsets */
$usedOffsets = []; $usedOffsets = [];
for($i = 0; $i < 1024; ++$i){ for($i = 0; $i < 1024; ++$i){
$index = $data[$i + 1]; $index = $data[$i + 1];
$offset = $index >> 8; $offset = $index >> 8;
if($offset !== 0){ if($offset !== 0){
fseek($this->filePointer, $offset << 12); self::getChunkCoords($i, $x, $z);
$fileOffset = $offset << 12;
fseek($this->filePointer, $fileOffset);
if(fgetc($this->filePointer) === false){ //Try and read from the location if(fgetc($this->filePointer) === false){ //Try and read from the location
throw new CorruptedRegionException("Region file location offset points to invalid location"); throw new CorruptedRegionException("Region file location offset x=$x,z=$z points to invalid file location $fileOffset");
}elseif(isset($usedOffsets[$offset])){ }elseif(isset($usedOffsets[$offset])){
throw new CorruptedRegionException("Found two chunk offsets pointing to the same location"); self::getChunkCoords($usedOffsets[$offset], $existingX, $existingZ);
throw new CorruptedRegionException("Found two chunk offsets (chunk1: x=$existingX,z=$existingZ, chunk2: x=$x,z=$z) pointing to the file location $fileOffset");
}else{ }else{
$usedOffsets[$offset] = true; $usedOffsets[$offset] = $i;
} }
} }