Merge commit '2712befa82dc92fe26d2b913a47200ad84927799'

# 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
2 changed files with 1 additions and 6 deletions

View File

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