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

LevelDB: log more stuff, stop bailing on recoverable errors

Browse Source
This commit is contained in:
Dylan K. Taylor
2023-05-02 16:46:45 +01:00
parent f29e2f7110
commit 5fcf5e0c40
3 changed files with 98 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/data/bedrock/block/upgrade/BlockDataUpgrader.php
View File

@ -24,7 +24,7 @@ declare(strict_types=1);
namespace pocketmine\data\bedrock\block\upgrade;
use pocketmine\data\bedrock\block\BlockStateData;
use pocketmine\data\bedrock\block\BlockTypeNames;
use pocketmine\data\bedrock\block\BlockStateDeserializeException;
use pocketmine\nbt\tag\CompoundTag;
final class BlockDataUpgrader{
@ -34,25 +34,30 @@ final class BlockDataUpgrader{
private BlockStateUpgrader $blockStateUpgrader
){}
public function upgradeIntIdMeta(int $id, int $meta) : ?BlockStateData{
/**
* @throws BlockStateDeserializeException
*/
public function upgradeIntIdMeta(int $id, int $meta) : BlockStateData{
return $this->blockIdMetaUpgrader->fromIntIdMeta($id, $meta);
}
public function upgradeStringIdMeta(string $id, int $meta) : ?BlockStateData{
/**
* @throws BlockStateDeserializeException
*/
public function upgradeStringIdMeta(string $id, int $meta) : BlockStateData{
return $this->blockIdMetaUpgrader->fromStringIdMeta($id, $meta);
}
public function upgradeBlockStateNbt(CompoundTag $tag) : ?BlockStateData{
/**
* @throws BlockStateDeserializeException
*/
public function upgradeBlockStateNbt(CompoundTag $tag) : BlockStateData{
if($tag->getTag("name") !== null && $tag->getTag("val") !== null){
//Legacy (pre-1.13) blockstate - upgrade it to a version we understand
$id = $tag->getString("name");
$data = $tag->getShort("val");
$blockStateData = $this->upgradeStringIdMeta($id, $data);
if($blockStateData === null){
//unknown block, invalid ID
$blockStateData = BlockStateData::current(BlockTypeNames::INFO_UPDATE, []);
}
}else{
//Modern (post-1.13) blockstate
$blockStateData = BlockStateData::fromNbt($tag);

17
src/data/bedrock/block/upgrade/BlockIdMetaUpgrader.php
View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\data\bedrock\block\upgrade;
use pocketmine\data\bedrock\block\BlockStateData;
use pocketmine\data\bedrock\block\BlockStateDeserializeException;
use pocketmine\nbt\LittleEndianNbtSerializer;
use pocketmine\utils\BinaryDataException;
use pocketmine\utils\BinaryStream;
@ -41,14 +42,22 @@ final class BlockIdMetaUpgrader{
private LegacyBlockIdToStringIdMap $legacyNumericIdMap
){}
public function fromStringIdMeta(string $id, int $meta) : ?BlockStateData{
return $this->mappingTable[$id][$meta] ?? $this->mappingTable[$id][0] ?? null;
/**
* @throws BlockStateDeserializeException
*/
public function fromStringIdMeta(string $id, int $meta) : BlockStateData{
return $this->mappingTable[$id][$meta] ??
$this->mappingTable[$id][0] ??
throw new BlockStateDeserializeException("Unknown legacy block string ID $id");
}
public function fromIntIdMeta(int $id, int $meta) : ?BlockStateData{
/**
* @throws BlockStateDeserializeException
*/
public function fromIntIdMeta(int $id, int $meta) : BlockStateData{
$stringId = $this->legacyNumericIdMap->legacyToString($id);
if($stringId === null){
return null;
throw new BlockStateDeserializeException("Unknown legacy block numeric ID $id");
}
return $this->fromStringIdMeta($stringId, $meta);
}