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

Merge branch 'next-minor' into next-major

Browse Source
This commit is contained in:
Dylan K. Taylor
2023-01-12 22:08:25 +00:00
parent c671d8a80b 91ac47ecba
commit ecd8f151f1
23 changed files with 257 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/data/bedrock/block/convert/BlockObjectToStateSerializer.php
View File

@ -236,11 +236,7 @@ final class BlockObjectToStateSerializer implements BlockStateSerializer{
$locatedSerializer = $this->serializers[$typeId][get_class($blockState)] ?? null;
if($locatedSerializer === null){
$parents = class_parents($blockState);
if($parents === false){
throw new AssumptionFailedError("A block class should always have at least one parent");
}
foreach($parents as $parent){
foreach(class_parents($blockState) as $parent){
if(isset($this->serializers[$typeId][$parent])){
$locatedSerializer = $this->serializers[$typeId][$parent];
break;

22
src/data/bedrock/item/ItemSerializer.php
View File

@ -103,13 +103,10 @@ final class ItemSerializer{
$locatedSerializer = $this->itemSerializers[$index][get_class($item)] ?? null;
if($locatedSerializer === null){
$parents = class_parents($item);
if($parents !== false){
foreach($parents as $parent){
if(isset($this->itemSerializers[$index][$parent])){
$locatedSerializer = $this->itemSerializers[$index][$parent];
break;
}
foreach(class_parents($item) as $parent){
if(isset($this->itemSerializers[$index][$parent])){
$locatedSerializer = $this->itemSerializers[$index][$parent];
break;
}
}
}
@ -162,13 +159,10 @@ final class ItemSerializer{
$locatedSerializer = $this->blockItemSerializers[$index][get_class($block)] ?? null;
if($locatedSerializer === null){
$parents = class_parents($block);
if($parents !== false){
foreach($parents as $parent){
if(isset($this->blockItemSerializers[$index][$parent])){
$locatedSerializer = $this->blockItemSerializers[$index][$parent];
break;
}
foreach(class_parents($block) as $parent){
if(isset($this->blockItemSerializers[$index][$parent])){
$locatedSerializer = $this->blockItemSerializers[$index][$parent];
break;
}
}
}