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

Merge commit '2712befa82dc92fe26d2b913a47200ad84927799'

Browse Source 
# Conflicts:
#	resources/vanilla
#	tests/phpstan/configs/l8-baseline.neon
This commit is contained in:
Dylan K. Taylor 2020-06-17 20:49:46 +01:00
commit 7c79a28fdb
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/mcpe/protocol/types/SkinData.php
View File

@ -75,7 +75,7 @@ class SkinData{
$this->resourcePatch = $resourcePatch; $this->resourcePatch = $resourcePatch;
$this->skinImage = $skinImage; $this->skinImage = $skinImage;
$this->animations = $animations; $this->animations = $animations;
$this->capeImage = $capeImage; $this->capeImage = $capeImage ?? new SkinImage(0, 0, "");
$this->geometryData = $geometryData; $this->geometryData = $geometryData;
$this->animationData = $animationData; $this->animationData = $animationData;
$this->premium = $premium; $this->premium = $premium;

5
tests/phpstan/configs/l8-baseline.neon
View File

@ -535,11 +535,6 @@ parameters:
count: 1 count: 1
path: ../../../src/network/mcpe/protocol/SetScoreboardIdentityPacket.php path: ../../../src/network/mcpe/protocol/SetScoreboardIdentityPacket.php
-
message: "#^Property pocketmine\\\\network\\\\mcpe\\\\protocol\\\\types\\\\SkinData\\:\\:\\$capeImage \\(pocketmine\\\\network\\\\mcpe\\\\protocol\\\\types\\\\SkinImage\\) does not accept pocketmine\\\\network\\\\mcpe\\\\protocol\\\\types\\\\SkinImage\\|null\\.$#"
count: 1
path: ../../../src/network/mcpe/protocol/types/SkinData.php
- -
message: "#^Property pocketmine\\\\network\\\\mcpe\\\\protocol\\\\types\\\\entity\\\\EntityLink\\:\\:\\$fromEntityUniqueId \\(int\\) does not accept int\\|null\\.$#" message: "#^Property pocketmine\\\\network\\\\mcpe\\\\protocol\\\\types\\\\entity\\\\EntityLink\\:\\:\\$fromEntityUniqueId \\(int\\) does not accept int\\|null\\.$#"
count: 1 count: 1