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

Merge branch 'minor-next' of github.com:pmmp/PocketMine-MP into major-next

Browse Source
This commit is contained in:
Dylan K. Taylor
2024-08-09 13:33:07 +01:00
parent 12179aa03a ee17ac5246
commit c9e8d382c5
66 changed files with 1327 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/phpstan/configs/actual-problems.neon
View File

@ -580,6 +580,11 @@ parameters:
count: 1
path: ../../../src/network/mcpe/ChunkRequestTask.php
-
message: "#^Match expression does not handle remaining values\\: pocketmine\\\\crafting\\\\FurnaceType\\:\\:CAMPFIRE\\|pocketmine\\\\crafting\\\\FurnaceType\\:\\:SOUL_CAMPFIRE$#"
count: 1
path: ../../../src/network/mcpe/InventoryManager.php
-
message: "#^Cannot call method doFirstSpawn\\(\\) on pocketmine\\\\player\\\\Player\\|null\\.$#"
count: 1

15
tests/phpunit/block/block_factory_consistency_check.json
View File

@ -79,6 +79,7 @@
"CAKE_WITH_CANDLE": 2,
"CAKE_WITH_DYED_CANDLE": 32,
"CALCITE": 1,
"CAMPFIRE": 8,
"CANDLE": 8,
"CARPET": 16,
"CARROTS": 8,
@ -111,6 +112,8 @@
"CHISELED_RED_SANDSTONE": 1,
"CHISELED_SANDSTONE": 1,
"CHISELED_STONE_BRICKS": 1,
"CHISELED_TUFF": 1,
"CHISELED_TUFF_BRICKS": 1,
"CHORUS_FLOWER": 6,
"CHORUS_PLANT": 1,
"CLAY": 1,
@ -532,6 +535,10 @@
"POLISHED_GRANITE": 1,
"POLISHED_GRANITE_SLAB": 3,
"POLISHED_GRANITE_STAIRS": 8,
"POLISHED_TUFF": 1,
"POLISHED_TUFF_SLAB": 3,
"POLISHED_TUFF_STAIRS": 8,
"POLISHED_TUFF_WALL": 162,
"POPPY": 1,
"POTATOES": 8,
"POTION_CAULDRON": 6,
@ -610,6 +617,7 @@
"SMOOTH_STONE_SLAB": 3,
"SNOW": 1,
"SNOW_LAYER": 8,
"SOUL_CAMPFIRE": 8,
"SOUL_FIRE": 1,
"SOUL_LANTERN": 2,
"SOUL_SAND": 1,
@ -660,6 +668,13 @@
"TRIPWIRE": 16,
"TRIPWIRE_HOOK": 16,
"TUFF": 1,
"TUFF_BRICKS": 1,
"TUFF_BRICK_SLAB": 3,
"TUFF_BRICK_STAIRS": 8,
"TUFF_BRICK_WALL": 162,
"TUFF_SLAB": 3,
"TUFF_STAIRS": 8,
"TUFF_WALL": 162,
"TWISTING_VINES": 26,
"UNDERWATER_TORCH": 5,
"VINES": 16,

15
tests/phpunit/data/bedrock/block/BlockStateDataTest.php
View File

@ -27,6 +27,7 @@ use PHPUnit\Framework\TestCase;
use pocketmine\data\bedrock\block\BlockStateData;
use pocketmine\data\bedrock\block\upgrade\BlockStateUpgradeSchemaUtils;
use Symfony\Component\Filesystem\Path;
use function sprintf;
use const PHP_INT_MAX;
use const pocketmine\BEDROCK_BLOCK_UPGRADE_SCHEMA_PATH;
@ -39,7 +40,19 @@ final class BlockStateDataTest extends TestCase{
) as $schema){
$expected = BlockStateData::CURRENT_VERSION;
$actual = $schema->getVersionId();
self::assertLessThanOrEqual($expected, $actual, "Schema version $actual is newer than the current version $expected");
self::assertLessThanOrEqual($expected, $actual, sprintf(
"Schema version %d (%d.%d.%d.%d) is newer than the current version %d (%d.%d.%d.%d)",
$actual,
($actual >> 24) & 0xff,
($actual >> 16) & 0xff,
($actual >> 8) & 0xff,
$actual & 0xff,
$expected,
($expected >> 24) & 0xff,
($expected >> 16) & 0xff,
($expected >> 8) & 0xff,
$expected & 0xff
));
}
}
}