Release 3.22.5

64x32 has some corruption issues and generally just looks really bad.

.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
@@ -68,7 +68,7 @@ jobs:
           done
 
       - name: Build PocketMine-MP.phar
-        run: php build/server-phar.php --git ${{ github.sha }}
+        run: php -dphar.readonly=0 build/server-phar.php --git ${{ github.sha }}
 
       - name: Get PocketMine-MP release version
         id: get-pm-version

.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

build/make-release.php

@@ -81,6 +81,7 @@ function main(array $argv) : void{
 		$currentVer->getPatch() + 1
 	));
 
+	echo "About to tag version $currentVer. Next version will be $nextVer.\n";
 	echo "please add appropriate notes to the changelog and press enter...";
 	fgets(STDIN);
 	system('git add "' . dirname(__DIR__) . '/changelogs"');

changelogs/3.22.md

@@ -28,3 +28,9 @@ Plugin developers should **only** update their required API to this version if y
 # 3.22.3
 - Fixed a bug in the release build of 3.22.2 which caused the crash archive to reject all crashdumps.
 - Fixed possible server crash during player spawning.
+
+# 3.22.4
+- Fixed a bug which broke the build of 3.22.3.
+
+# 3.22.5
+- Added a workaround for polyfilled solid-colour Persona skin replacements turning into a corrupted mess (caused by https://bugs.mojang.com/browse/MCPE-130275).

phpstan.neon.dist

@@ -4,8 +4,8 @@ includes:
 	- tests/phpstan/configs/gc-hacks.neon
 	- tests/phpstan/configs/l7-baseline.neon
 	- tests/phpstan/configs/l8-baseline.neon
-	- tests/phpstan/configs/php74-compat.neon
 	- tests/phpstan/configs/php-bugs.neon
+	- tests/phpstan/configs/php74-compat.neon
 	- tests/phpstan/configs/phpstan-bugs.neon
 	- tests/phpstan/configs/phpunit-wiring-tests.neon
 	- tests/phpstan/configs/pthreads-bugs.neon
@@ -22,24 +22,25 @@ parameters:
 	bootstrapFiles:
 		- tests/phpstan/bootstrap.php
 	scanDirectories:
+		- build
 		- tests/plugins/TesterPlugin
 	scanFiles:
 		- src/pocketmine/PocketMine.php
-		- build/make-release.php
-		- build/server-phar.php
 	paths:
+		- build
 		- src
-		- build/make-release.php
-		- build/server-phar.php
 		- tests/phpunit
 		- tests/plugins/TesterPlugin
+	excludePaths:
+		analyseAndScan:
+			- build/preprocessor
 	dynamicConstantNames:
-		- pocketmine\IS_DEVELOPMENT_BUILD
 		- pocketmine\DEBUG
+		- pocketmine\IS_DEVELOPMENT_BUILD
 	stubFiles:
-		- tests/phpstan/stubs/pthreads.stub
 		- tests/phpstan/stubs/chunkutils.stub
 		- tests/phpstan/stubs/leveldb.stub
+		- tests/phpstan/stubs/pthreads.stub
 	reportUnmatchedIgnoredErrors: false #no other way to silence platform-specific non-warnings
 	staticReflectionClassNamePatterns:
 		- "#^COM$#"

src/pocketmine/VersionInfo.php

@@ -33,7 +33,7 @@ if(defined('pocketmine\_VERSION_INFO_INCLUDED')){
 const _VERSION_INFO_INCLUDED = true;
 
 const NAME = "PocketMine-MP";
-const BASE_VERSION = "3.22.3";
+const BASE_VERSION = "3.22.5";
 const IS_DEVELOPMENT_BUILD = false;
 const BUILD_NUMBER = 0;
 const BUILD_CHANNEL = "stable";

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();