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

Merge 'minor-next' into 'major-next'

Browse Source 
Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/12307996607
This commit is contained in:
pmmp-admin-bot[bot]
2024-12-13 01:40:43 +00:00
parent 851bbd7384 636f562bcf
commit f82c8dd3d3
15 changed files with 251 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/phpstan/configs/phpstan-bugs.neon
View File

@ -60,6 +60,11 @@ parameters:
count: 1
path: ../../../src/block/VanillaBlocks.php
-
message: "#^Creating callable from a non\\-native static method pocketmine\\\\item\\\\VanillaItems\\:\\:PALE_OAK_SIGN\\(\\)\\.$#"
count: 1
path: ../../../src/block/VanillaBlocks.php
-
message: "#^Creating callable from a non\\-native static method pocketmine\\\\item\\\\VanillaItems\\:\\:SPRUCE_SIGN\\(\\)\\.$#"
count: 1

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

@ -112,6 +112,7 @@
"CHISELED_POLISHED_BLACKSTONE": 1,
"CHISELED_QUARTZ": 3,
"CHISELED_RED_SANDSTONE": 1,
"CHISELED_RESIN_BRICKS": 1,
"CHISELED_SANDSTONE": 1,
"CHISELED_STONE_BRICKS": 1,
"CHISELED_TUFF": 1,
@ -511,6 +512,20 @@
"OXEYE_DAISY": 1,
"PACKED_ICE": 1,
"PACKED_MUD": 1,
"PALE_OAK_BUTTON": 12,
"PALE_OAK_DOOR": 32,
"PALE_OAK_FENCE": 1,
"PALE_OAK_FENCE_GATE": 16,
"PALE_OAK_LEAVES": 4,
"PALE_OAK_LOG": 6,
"PALE_OAK_PLANKS": 1,
"PALE_OAK_PRESSURE_PLATE": 2,
"PALE_OAK_SIGN": 16,
"PALE_OAK_SLAB": 3,
"PALE_OAK_STAIRS": 8,
"PALE_OAK_TRAPDOOR": 16,
"PALE_OAK_WALL_SIGN": 4,
"PALE_OAK_WOOD": 6,
"PEONY": 2,
"PINK_PETALS": 16,
"PINK_TULIP": 1,
@ -594,6 +609,12 @@
"RED_TULIP": 1,
"REINFORCED_DEEPSLATE": 1,
"RESERVED6": 1,
"RESIN": 1,
"RESIN_BRICKS": 1,
"RESIN_BRICK_SLAB": 3,
"RESIN_BRICK_STAIRS": 8,
"RESIN_BRICK_WALL": 162,
"RESIN_CLUMP": 64,
"ROSE_BUSH": 2,
"SAND": 1,
"SANDSTONE": 1,
@ -754,6 +775,8 @@
"NOTE_BLOCK": "pocketmine\\block\\tile\\Note",
"OAK_SIGN": "pocketmine\\block\\tile\\Sign",
"OAK_WALL_SIGN": "pocketmine\\block\\tile\\Sign",
"PALE_OAK_SIGN": "pocketmine\\block\\tile\\Sign",
"PALE_OAK_WALL_SIGN": "pocketmine\\block\\tile\\Sign",
"POTION_CAULDRON": "pocketmine\\block\\tile\\Cauldron",
"REDSTONE_COMPARATOR": "pocketmine\\block\\tile\\Comparator",
"SHULKER_BOX": "pocketmine\\block\\tile\\ShulkerBox",