From 39820be836a6ed82cc56c85dfd6e6bafc9515f81 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Tue, 7 Sep 2021 12:59:32 +0100 Subject: [PATCH 1/3] draft-release: preprocess only src of dependencies p sure we had this problem already somewhere else? ... --- .github/workflows/draft-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 4015c96c2..37b743422 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -55,7 +55,7 @@ jobs: cp -r "$VENDOR_PM" "$VENDOR_PM_BACKUP" for f in $(ls $VENDOR_PM/pocketmine); do echo "Processing directory \"$f\"..." - php "$PM_PREPROCESSOR_PATH/PreProcessor.php" --path="$VENDOR_PM/pocketmine/$f" --multisize || (echo "Preprocessor exited with code $?" && exit 1) + php "$PM_PREPROCESSOR_PATH/PreProcessor.php" --path="$VENDOR_PM/pocketmine/$f/src" --multisize || (echo "Preprocessor exited with code $?" && exit 1) echo "Checking for changes in \"$f\"..." DIFF=$(git diff --no-index "$VENDOR_PM_BACKUP/pocketmine/$f" "$VENDOR_PM/pocketmine/$f" || true) if [ "$DIFF" != "" ]; then From 806f03bd37d8350ebebe1871a189b8fc2594fae0 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Tue, 7 Sep 2021 13:00:28 +0100 Subject: [PATCH 2/3] consistency ... --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 585e6040e..0c2f95b9b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -248,7 +248,7 @@ jobs: cp -r "$VENDOR_PM" "$VENDOR_PM_BACKUP" for f in $(ls $VENDOR_PM/pocketmine); do echo "Processing directory \"$f\"..." - php "$PM_PREPROCESSOR_PATH/PreProcessor.php" --path="$VENDOR_PM/pocketmine/$f" --multisize || (echo "Preprocessor exited with code $?" && exit 1) + php "$PM_PREPROCESSOR_PATH/PreProcessor.php" --path="$VENDOR_PM/pocketmine/$f/src" --multisize || (echo "Preprocessor exited with code $?" && exit 1) echo "Checking for changes in \"$f\"..." DIFF=$(git diff --no-index "$VENDOR_PM_BACKUP/pocketmine/$f" "$VENDOR_PM/pocketmine/$f" || true) if [ "$DIFF" != "" ]; then From 4c65a0cdaa6b4b23f22672a47fd984ba65c73cd4 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 9 Sep 2021 16:04:43 +0100 Subject: [PATCH 3/3] LegacySkinAdapter: Use 64x64 for persona polyfilled skins 64x32 has some corruption issues and generally just looks really bad. --- .../network/mcpe/protocol/types/LegacySkinAdapter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/network/mcpe/protocol/types/LegacySkinAdapter.php b/src/pocketmine/network/mcpe/protocol/types/LegacySkinAdapter.php index 44900f65c..55d604be7 100644 --- a/src/pocketmine/network/mcpe/protocol/types/LegacySkinAdapter.php +++ b/src/pocketmine/network/mcpe/protocol/types/LegacySkinAdapter.php @@ -54,7 +54,7 @@ class LegacySkinAdapter implements SkinAdapter{ public function fromSkinData(SkinData $data) : Skin{ if($data->isPersona()){ - return new Skin("Standard_Custom", str_repeat(random_bytes(3) . "\xff", 2048)); + return new Skin("Standard_Custom", str_repeat(random_bytes(3) . "\xff", 4096)); } $capeData = $data->isPersonaCapeOnClassic() ? "" : $data->getCapeImage()->getData();