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

Possible fix for 'Invalid Chunk given' crash

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-08-10 13:09:34 +02:00
parent 06c01f14c6
commit 4d7c953572
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pocketmine/level/format/anvil/RegionLoader.php
View File

@ -55,7 +55,7 @@ class RegionLoader extends \pocketmine\level\format\mcregion\RegionLoader{
} }
} }
public function readChunk($x, $z, $generate = true){ public function readChunk($x, $z, $generate = true, $forward = false){
$index = self::getChunkOffset($x, $z); $index = self::getChunkOffset($x, $z);
if($index < 0 or $index >= 4096){ if($index < 0 or $index >= 4096){
//Regenerate chunk due to corruption //Regenerate chunk due to corruption
@ -97,8 +97,15 @@ class RegionLoader extends \pocketmine\level\format\mcregion\RegionLoader{
} }
$chunk = Chunk::fromBinary(fread($this->filePointer, $length - 1), $this->levelProvider); $chunk = Chunk::fromBinary(fread($this->filePointer, $length - 1), $this->levelProvider);
if($chunk instanceof Chunk){
return $chunk instanceof Chunk ? $chunk : false; return $chunk;
}elseif($forward === false){
trigger_error("Corrupted chunk detected", E_USER_WARNING);
$this->generateChunk($x, $z);
return $this->readChunk($x, $z, $generate, true);
}else{
return null;
}
} }
public function generateChunk($x, $z){ public function generateChunk($x, $z){

13
src/pocketmine/level/format/mcregion/RegionLoader.php
View File

@ -79,7 +79,7 @@ class RegionLoader{
return !($this->locationTable[$index][0] === 0 or $this->locationTable[$index][1] === 0); return !($this->locationTable[$index][0] === 0 or $this->locationTable[$index][1] === 0);
} }
public function readChunk($x, $z, $generate = true){ public function readChunk($x, $z, $generate = true, $forward = false){
$index = self::getChunkOffset($x, $z); $index = self::getChunkOffset($x, $z);
if($index < 0 or $index >= 4096){ if($index < 0 or $index >= 4096){
//Regenerate chunk due to corruption //Regenerate chunk due to corruption
@ -121,8 +121,15 @@ class RegionLoader{
} }
$chunk = Chunk::fromBinary(fread($this->filePointer, $length - 1), $this->levelProvider); $chunk = Chunk::fromBinary(fread($this->filePointer, $length - 1), $this->levelProvider);
if($chunk instanceof Chunk){
return $chunk instanceof Chunk ? $chunk : false; return $chunk;
}elseif($forward === false){
trigger_error("Corrupted chunk detected", E_USER_WARNING);
$this->generateChunk($x, $z);
return $this->readChunk($x, $z, $generate, true);
}else{
return null;
}
} }
public function chunkExists($x, $z){ public function chunkExists($x, $z){