Release 3.25.6

Fixed borked build number
this was a problem before the recent clean-up; the only reason it just decided to show now is because 2000+25 is valid PHP code, so PHP saved our asses.
2025-09-10 11:38:08 +00:00 · 2021-11-26 23:37:46 +00:00 · 2021-11-26 23:36:19 +00:00 · 2021-11-26 23:20:48 +00:00 · 2021-11-26 23:20:40 +00:00 · 2021-11-26 22:32:25 +00:00
21 changed files with 209 additions and 133 deletions
--- a/.github/workflows/draft-release.yml
+++ b/.github/workflows/draft-release.yml
@ -35,11 +35,12 @@ jobs:
      - name: Install Composer dependencies
        run: composer install --no-dev --prefer-dist --no-interaction --ignore-platform-reqs

-      - name: Patch VersionInfo
+      - name: Calculate build number
+        id: build-number
        run: |
-          BUILD_NUMBER=2000+$GITHUB_RUN_NUMBER #to stay above jenkins
+          BUILD_NUMBER=$((2000+$GITHUB_RUN_NUMBER)) #to stay above jenkins
          echo "Build number: $BUILD_NUMBER"
-          sed -i "s/const BUILD_NUMBER = 0/const BUILD_NUMBER = ${BUILD_NUMBER}/" src/pocketmine/VersionInfo.php
+          echo ::set-output name=BUILD_NUMBER::$BUILD_NUMBER

      - name: Minify BedrockData JSON files
        run: php src/pocketmine/resources/vanilla/.minify_json.php
@ -68,7 +69,7 @@ jobs:
          done

      - name: Build PocketMine-MP.phar
-        run: php -dphar.readonly=0 build/server-phar.php --git ${{ github.sha }}
+        run: php -dphar.readonly=0 build/server-phar.php --git ${{ github.sha }} --build ${{ steps.build-number.outputs.BUILD_NUMBER }}

      - name: Get PocketMine-MP release version
        id: get-pm-version
@ -79,7 +80,7 @@ jobs:
          echo ::set-output name=PM_VERSION_MD::$(php -r 'require "vendor/autoload.php"; echo str_replace(".", "", \pocketmine\BASE_VERSION);')

      - name: Generate build info
-        run: php build/generate-build-info-json.php ${{ github.sha }} ${{ steps.get-pm-version.outputs.PM_VERSION }} ${{ github.repository }} > build_info.json
+        run: php build/generate-build-info-json.php ${{ github.sha }} ${{ steps.get-pm-version.outputs.PM_VERSION }} ${{ github.repository }} ${{ steps.build-number.outputs.BUILD_NUMBER }} > build_info.json

      - name: Upload release artifacts
        uses: actions/upload-artifact@v2
--- a/README.md
+++ b/README.md
@ -5,7 +5,7 @@

 <p align="center">
 	<img src="https://github.com/pmmp/PocketMine-MP/workflows/CI/badge.svg" alt="CI" />
-	<a href="https://github.com/pmmp/PocketMine-MP/releases"><img src="https://img.shields.io/github/v/tag/pmmp/PocketMine-MP?label=release&logo=github" alt="GitHub tag (latest semver)" /></a>
+	<img alt="GitHub release (latest SemVer)" src="https://img.shields.io/github/v/release/pmmp/PocketMine-MP?label=release&sort=semver">
 	<a href="https://hub.docker.com/r/pmmp/pocketmine-mp"><img src="https://img.shields.io/docker/v/pmmp/pocketmine-mp?logo=docker&label=image" alt="Docker image version (latest semver)" /></a>
 	<a href="https://discord.gg/bmSAZBG"><img src="https://img.shields.io/discord/373199722573201408?label=discord&color=7289DA&logo=discord" alt="Discord" /></a>
 </p>
--- a/build/generate-build-info-json.php
+++ b/build/generate-build-info-json.php
@ -23,15 +23,15 @@ declare(strict_types=1);

 require dirname(__DIR__) . '/vendor/autoload.php';

-if(count($argv) !== 4){
-	fwrite(STDERR, "required args: <git hash> <tag name> <github repo (owner/name)>");
+if(count($argv) !== 5){
+	fwrite(STDERR, "required args: <git hash> <tag name> <github repo (owner/name)> <build number>");
 	exit(1);
 }

 echo json_encode([
 	"php_version" => sprintf("%d.%d", PHP_MAJOR_VERSION, PHP_MINOR_VERSION),
 	"base_version" => \pocketmine\BASE_VERSION,
-	"build" => \pocketmine\BUILD_NUMBER,
+	"build" => (int) $argv[4],
 	"is_dev" => \pocketmine\IS_DEVELOPMENT_BUILD,
 	"channel" => \pocketmine\BUILD_CHANNEL,
 	"git_commit" => $argv[1],
--- a/build/make-release.php
+++ b/build/make-release.php
@ -24,64 +24,95 @@ declare(strict_types=1);
 namespace pocketmine\build\make_release;

 use pocketmine\utils\VersionString;
-use function count;
+use function array_keys;
+use function array_map;
 use function dirname;
 use function fgets;
 use function file_get_contents;
 use function file_put_contents;
 use function fwrite;
+use function getopt;
+use function is_string;
+use function max;
 use function preg_replace;
 use function sleep;
 use function sprintf;
+use function str_pad;
+use function strlen;
 use function system;
 use const pocketmine\BASE_VERSION;
+use const pocketmine\BUILD_CHANNEL;
 use const STDERR;
 use const STDIN;
+use const STDOUT;
+use const STR_PAD_LEFT;

 require_once dirname(__DIR__) . '/vendor/autoload.php';

 function replaceVersion(string $versionInfoPath, string $newVersion, bool $isDev, string $channel) : void{
 	$versionInfo = file_get_contents($versionInfoPath);
 	$versionInfo = preg_replace(
-		$pattern = '/^const BASE_VERSION = "(\d+)\.(\d+)\.(\d+)(?:-(.*))?";$/m',
-		'const BASE_VERSION = "' . $newVersion . '";',
+		$pattern = '/^([\t ]*public )?const BASE_VERSION = "(\d+)\.(\d+)\.(\d+)(?:-(.*))?";$/m',
+		'$1const BASE_VERSION = "' . $newVersion . '";',
 		$versionInfo
 	);
 	$versionInfo = preg_replace(
-		'/^const IS_DEVELOPMENT_BUILD = (?:true|false);$/m',
-		'const IS_DEVELOPMENT_BUILD = ' . ($isDev ? 'true' : 'false') . ';',
+		'/^([\t ]*public )?const IS_DEVELOPMENT_BUILD = (?:true|false);$/m',
+		'$1const IS_DEVELOPMENT_BUILD = ' . ($isDev ? 'true' : 'false') . ';',
 		$versionInfo
 	);
 	$versionInfo = preg_replace(
-		'/^const BUILD_CHANNEL = ".*";$/m',
-		'const BUILD_CHANNEL = "' . $channel . '";',
+		'/^([\t ]*public )?const BUILD_CHANNEL = ".*";$/m',
+		'$1const BUILD_CHANNEL = "' . $channel . '";',
 		$versionInfo
 	);
 	file_put_contents($versionInfoPath, $versionInfo);
 }

-/**
- * @param string[] $argv
- * @phpstan-param list<string> $argv
- */
-function main(array $argv) : void{
-	if(count($argv) < 2){
-		fwrite(STDERR, "Arguments: <channel> [release version]\n");
-		exit(1);
+const ACCEPTED_OPTS = [
+	"current" => "Version to insert and tag",
+	"next" => "Version to put in the file after tagging",
+	"channel" => "Release channel to post this build into"
+];
+
+function main() : void{
+	$filteredOpts = [];
+	foreach(getopt("", ["current:", "next:", "channel:", "help"]) as $optName => $optValue){
+		if($optName === "help"){
+			fwrite(STDOUT, "Options:\n");
+
+			$maxLength = max(array_map(fn(string $str) => strlen($str), array_keys(ACCEPTED_OPTS)));
+			foreach(ACCEPTED_OPTS as $acceptedName => $description){
+				fwrite(STDOUT, str_pad("--$acceptedName", $maxLength + 4, " ", STR_PAD_LEFT) . ": $description\n");
+			}
+			exit(0);
+		}
+		if(!is_string($optValue)){
+			fwrite(STDERR, "--$optName expects exactly 1 value\n");
+			exit(1);
+		}
+		$filteredOpts[$optName] = $optValue;
 	}
-	if(isset($argv[2])){
-		$currentVer = new VersionString($argv[2]);
+
+	if(isset($filteredOpts["current"])){
+		$currentVer = new VersionString($filteredOpts["current"]);
 	}else{
 		$currentVer = new VersionString(BASE_VERSION);
 	}
-	$nextVer = new VersionString(sprintf(
-		"%u.%u.%u",
-		$currentVer->getMajor(),
-		$currentVer->getMinor(),
-		$currentVer->getPatch() + 1
-	));
+	if(isset($filteredOpts["next"])){
+		$nextVer = new VersionString($filteredOpts["next"]);
+	}else{
+		$nextVer = new VersionString(sprintf(
+			"%u.%u.%u",
+			$currentVer->getMajor(),
+			$currentVer->getMinor(),
+			$currentVer->getPatch() + 1
+		));
+	}
+	$channel = $filteredOpts["channel"] ?? BUILD_CHANNEL;

 	echo "About to tag version $currentVer. Next version will be $nextVer.\n";
+	echo "$currentVer will be published on release channel \"$channel\".\n";
 	echo "please add appropriate notes to the changelog and press enter...";
 	fgets(STDIN);
 	system('git add "' . dirname(__DIR__) . '/changelogs"');
@ -91,10 +122,10 @@ function main(array $argv) : void{
 		exit(1);
 	}
 	$versionInfoPath = dirname(__DIR__) . '/src/pocketmine/VersionInfo.php';
-	replaceVersion($versionInfoPath, $currentVer->getBaseVersion(), false, $argv[1]);
+	replaceVersion($versionInfoPath, $currentVer->getBaseVersion(), false, $channel);
 	system('git commit -m "Release ' . $currentVer->getBaseVersion() . '" --include "' . $versionInfoPath . '"');
 	system('git tag ' . $currentVer->getBaseVersion());
-	replaceVersion($versionInfoPath, $nextVer->getBaseVersion(), true, "");
+	replaceVersion($versionInfoPath, $nextVer->getBaseVersion(), true, $channel);
 	system('git add "' . $versionInfoPath . '"');
 	system('git commit -m "' . $nextVer->getBaseVersion() . ' is next" --include "' . $versionInfoPath . '"');
 	echo "pushing changes in 5 seconds\n";
@ -102,4 +133,4 @@ function main(array $argv) : void{
 	system('git push origin HEAD ' . $currentVer->getBaseVersion());
 }

-main($argv);
+main();
--- a/build/php
+++ b/build/php
--- a/build/server-phar.php
+++ b/build/server-phar.php
@ -134,13 +134,18 @@ function main() : void{
 		exit(1);
 	}

-	$opts = getopt("", ["out:", "git:"]);
+	$opts = getopt("", ["out:", "git:", "build:"]);
 	if(isset($opts["git"])){
 		$gitHash = $opts["git"];
 	}else{
 		$gitHash = Git::getRepositoryStatePretty(dirname(__DIR__));
 		echo "Git hash detected as $gitHash" . PHP_EOL;
 	}
+	if(isset($opts["build"])){
+		$build = (int) $opts["build"];
+	}else{
+		$build = 0;
+	}
 	foreach(buildPhar(
 		$opts["out"] ?? getcwd() . DIRECTORY_SEPARATOR . "PocketMine-MP.phar",
 		dirname(__DIR__) . DIRECTORY_SEPARATOR,
@ -149,7 +154,8 @@ function main() : void{
 			'vendor'
 		],
 		[
-			'git' => $gitHash
+			'git' => $gitHash,
+			'build' => $build
 		],
 		<<<'STUB'
 <?php
--- a/changelogs/3.25.md
+++ b/changelogs/3.25.md
@ -25,3 +25,14 @@ Plugin developers should **only** update their required API to this version if y
 # 3.25.3
 - Fixed crash when players try to pickup XP while already having max XP.
 - Added a sanity check to `Human->setCurrentTotalXp()` to try and catch an elusive bug that's been appearing in the wild - please get in touch if you know how to reproduce it!
+
+# 3.25.4
+- Fixed a long-standing issue with `Player->removeWindow()` breaking inventory UIs on the client.
+
+# 3.25.5
+- Protocol: Fixed incorrect encoding in `StructureSettings`
+- Fixed reading tags from non-docblock comments in script plugins.
+- Build number is now defined in phar metadata instead of being patched into the source code directly.
+
+# 3.25.6
+- Fixed borked build number in release build of 3.25.5.
--- a/composer.json
+++ b/composer.json
@ -38,7 +38,7 @@
      "pocketmine/spl": "^0.4.0"
   },
   "require-dev": {
-      "phpstan/phpstan": "1.1.1",
+      "phpstan/phpstan": "1.2.0",
      "phpstan/phpstan-phpunit": "^1.0.0",
      "phpstan/phpstan-strict-rules": "^1.0.0",
      "phpunit/phpunit": "^9.2"
--- a/composer.lock
+++ b/composer.lock
@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "5a6a10488d889d0f844cce59e6c34809",
+    "content-hash": "f13c4ed7311b99ac07dca31d2f77ad1d",
    "packages": [
        {
            "name": "adhocore/json-comment",
@ -484,6 +484,7 @@
                "issues": "https://github.com/pmmp/SPL/issues",
                "source": "https://github.com/pmmp/SPL/tree/0.4.2"
            },
+            "abandoned": true,
            "time": "2021-01-15T15:15:23+00:00"
        }
    ],
@ -617,16 +618,16 @@
        },
        {
            "name": "nikic/php-parser",
-            "version": "v4.13.0",
+            "version": "v4.13.1",
            "source": {
                "type": "git",
                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "50953a2691a922aa1769461637869a0a2faa3f53"
+                "reference": "63a79e8daa781cac14e5195e63ed8ae231dd10fd"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/50953a2691a922aa1769461637869a0a2faa3f53",
-                "reference": "50953a2691a922aa1769461637869a0a2faa3f53",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/63a79e8daa781cac14e5195e63ed8ae231dd10fd",
+                "reference": "63a79e8daa781cac14e5195e63ed8ae231dd10fd",
                "shasum": ""
            },
            "require": {
@ -667,9 +668,9 @@
            ],
            "support": {
                "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.1"
            },
-            "time": "2021-09-20T12:20:58+00:00"
+            "time": "2021-11-03T20:52:16+00:00"
        },
        {
            "name": "phar-io/manifest",
@ -1011,16 +1012,16 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "1.1.1",
+            "version": "1.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "cb317029197236c571c1b9305b8dd12850d8d85c"
+                "reference": "cbe085f9fdead5b6d62e4c022ca52dc9427a10ee"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cb317029197236c571c1b9305b8dd12850d8d85c",
-                "reference": "cb317029197236c571c1b9305b8dd12850d8d85c",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cbe085f9fdead5b6d62e4c022ca52dc9427a10ee",
+                "reference": "cbe085f9fdead5b6d62e4c022ca52dc9427a10ee",
                "shasum": ""
            },
            "require": {
@ -1036,7 +1037,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-master": "1.2-dev"
                }
            },
            "autoload": {
@ -1051,7 +1052,7 @@
            "description": "PHPStan - PHP Static Analysis Tool",
            "support": {
                "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.1.1"
+                "source": "https://github.com/phpstan/phpstan/tree/1.2.0"
            },
            "funding": [
                {
@ -1071,7 +1072,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-11-06T22:46:47+00:00"
+            "time": "2021-11-18T14:09:01+00:00"
        },
        {
            "name": "phpstan/phpstan-phpunit",
@ -1130,21 +1131,21 @@
        },
        {
            "name": "phpstan/phpstan-strict-rules",
-            "version": "1.0.0",
+            "version": "1.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan-strict-rules.git",
-                "reference": "7f50eb112f37fda2ef956813d3f1e9b1e69d7940"
+                "reference": "e12d55f74a8cca18c6e684c6450767e055ba7717"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/7f50eb112f37fda2ef956813d3f1e9b1e69d7940",
-                "reference": "7f50eb112f37fda2ef956813d3f1e9b1e69d7940",
+                "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/e12d55f74a8cca18c6e684c6450767e055ba7717",
+                "reference": "e12d55f74a8cca18c6e684c6450767e055ba7717",
                "shasum": ""
            },
            "require": {
                "php": "^7.1 || ^8.0",
-                "phpstan/phpstan": "^1.0"
+                "phpstan/phpstan": "^1.2.0"
            },
            "require-dev": {
                "nikic/php-parser": "^4.13.0",
@ -1175,22 +1176,22 @@
            "description": "Extra strict and opinionated rules for PHPStan",
            "support": {
                "issues": "https://github.com/phpstan/phpstan-strict-rules/issues",
-                "source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.0.0"
+                "source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.1.0"
            },
-            "time": "2021-10-11T06:57:58+00:00"
+            "time": "2021-11-18T09:30:29+00:00"
        },
        {
            "name": "phpunit/php-code-coverage",
-            "version": "9.2.8",
+            "version": "9.2.9",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "cf04e88a2e3c56fc1a65488afd493325b4c1bc3e"
+                "reference": "f301eb1453c9e7a1bc912ee8b0ea9db22c60223b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/cf04e88a2e3c56fc1a65488afd493325b4c1bc3e",
-                "reference": "cf04e88a2e3c56fc1a65488afd493325b4c1bc3e",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f301eb1453c9e7a1bc912ee8b0ea9db22c60223b",
+                "reference": "f301eb1453c9e7a1bc912ee8b0ea9db22c60223b",
                "shasum": ""
            },
            "require": {
@ -1246,7 +1247,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.8"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.9"
            },
            "funding": [
                {
@ -1254,7 +1255,7 @@
                    "type": "github"
                }
            ],
-            "time": "2021-10-30T08:01:38+00:00"
+            "time": "2021-11-19T15:21:02+00:00"
        },
        {
            "name": "phpunit/php-file-iterator",
@ -2029,16 +2030,16 @@
        },
        {
            "name": "sebastian/exporter",
-            "version": "4.0.3",
+            "version": "4.0.4",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65"
+                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/d89cc98761b8cb5a1a235a6b703ae50d34080e65",
-                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9",
+                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9",
                "shasum": ""
            },
            "require": {
@ -2087,14 +2088,14 @@
                }
            ],
            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "homepage": "https://www.github.com/sebastianbergmann/exporter",
            "keywords": [
                "export",
                "exporter"
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.3"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4"
            },
            "funding": [
                {
@ -2102,7 +2103,7 @@
                    "type": "github"
                }
            ],
-            "time": "2020-09-28T05:24:23+00:00"
+            "time": "2021-11-11T14:18:36+00:00"
        },
        {
            "name": "sebastian/global-state",
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@ -4,7 +4,6 @@ includes:
 	- tests/phpstan/configs/php-bugs.neon
 	- tests/phpstan/configs/phpstan-bugs.neon
 	- tests/phpstan/configs/phpunit-wiring-tests.neon
-	- tests/phpstan/configs/pthreads-bugs.neon
 	- tests/phpstan/configs/runtime-type-checks.neon
 	- tests/phpstan/configs/spl-fixed-array-sucks.neon
 	- vendor/phpstan/phpstan-phpunit/extension.neon
--- a/src/pocketmine/MemoryManager.php
+++ b/src/pocketmine/MemoryManager.php
@ -353,35 +353,33 @@ class MemoryManager{
 		file_put_contents($outputFolder . "/staticProperties.js", json_encode($staticProperties, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
 		$logger->info("[Dump] Wrote $staticCount static properties");

-		if(isset($GLOBALS)){ //This might be null if we're on a different thread
-			$globalVariables = [];
-			$globalCount = 0;
+		$globalVariables = [];
+		$globalCount = 0;

-			$ignoredGlobals = [
-				'GLOBALS' => true,
-				'_SERVER' => true,
-				'_REQUEST' => true,
-				'_POST' => true,
-				'_GET' => true,
-				'_FILES' => true,
-				'_ENV' => true,
-				'_COOKIE' => true,
-				'_SESSION' => true
-			];
+		$ignoredGlobals = [
+			'GLOBALS' => true,
+			'_SERVER' => true,
+			'_REQUEST' => true,
+			'_POST' => true,
+			'_GET' => true,
+			'_FILES' => true,
+			'_ENV' => true,
+			'_COOKIE' => true,
+			'_SESSION' => true
+		];

-			foreach($GLOBALS as $varName => $value){
-				if(isset($ignoredGlobals[$varName])){
-					continue;
-				}
-
-				$globalCount++;
-				$globalVariables[$varName] = self::continueDump($value, $objects, $refCounts, 0, $maxNesting, $maxStringSize);
+		foreach($GLOBALS as $varName => $value){
+			if(isset($ignoredGlobals[$varName])){
+				continue;
 			}

-			file_put_contents($outputFolder . "/globalVariables.js", json_encode($globalVariables, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
-			$logger->info("[Dump] Wrote $globalCount global variables");
+			$globalCount++;
+			$globalVariables[$varName] = self::continueDump($value, $objects, $refCounts, 0, $maxNesting, $maxStringSize);
 		}

+		file_put_contents($outputFolder . "/globalVariables.js", json_encode($globalVariables, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
+		$logger->info("[Dump] Wrote $globalCount global variables");
+
 		$data = self::continueDump($startingObject, $objects, $refCounts, 0, $maxNesting, $maxStringSize);

 		do{
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@ -3124,10 +3124,22 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			$this->removeWindow($this->windowIndex[$packet->windowId]);
 			$this->closingWindowId = null;
 			//removeWindow handles sending the appropriate
-			return true;
+		}else{
+			/*
+			 * TODO: HACK!
+			 * If we told the client to remove a window on our own (e.g. a plugin called removeWindow()), our
+			 * first ContainerClose tricks the client into behaving as if it itself asked for the window to be closed.
+			 * This means that it will send us a ContainerClose of its own, which we must respond to the same way as if
+			 * the client closed the window by itself.
+			 * If we don't, the client will not be able to open any new windows.
+			 */
+			$pk = new ContainerClosePacket();
+			$pk->windowId = $packet->windowId;
+			$pk->server = false;
+			$this->sendDataPacket($pk);
 		}

-		return false;
+		return true;
 	}

 	public function handleAdventureSettings(AdventureSettingsPacket $packet) : bool{
--- a/src/pocketmine/PocketMine.php
+++ b/src/pocketmine/PocketMine.php
@ -212,10 +212,8 @@ JIT_WARNING

 		set_error_handler([Utils::class, 'errorExceptionHandler']);

-		$version = new VersionString(\pocketmine\BASE_VERSION, \pocketmine\IS_DEVELOPMENT_BUILD, \pocketmine\BUILD_NUMBER);
-		define('pocketmine\VERSION', $version->getFullVersion(true));
-
 		$gitHash = str_repeat("00", 20);
+		$buildNumber = 0;

 		if(\Phar::running(true) === ""){
 			$gitHash = Git::getRepositoryStatePretty(\pocketmine\PATH);
@ -225,9 +223,16 @@ JIT_WARNING
 			if(isset($meta["git"])){
 				$gitHash = $meta["git"];
 			}
+			if(isset($meta["build"]) && is_int($meta["build"])){
+				$buildNumber = $meta["build"];
+			}
 		}

 		define('pocketmine\GIT_COMMIT', $gitHash);
+		define('pocketmine\BUILD_NUMBER', $buildNumber);
+
+		$version = new VersionString(\pocketmine\BASE_VERSION, \pocketmine\IS_DEVELOPMENT_BUILD, \pocketmine\BUILD_NUMBER);
+		define('pocketmine\VERSION', $version->getFullVersion(true));

 		$composerGitHash = InstalledVersions::getReference('pocketmine/pocketmine-mp');
 		if($composerGitHash !== null){
--- a/src/pocketmine/VersionInfo.php
+++ b/src/pocketmine/VersionInfo.php
@ -33,7 +33,6 @@ if(defined('pocketmine\_VERSION_INFO_INCLUDED')){
 const _VERSION_INFO_INCLUDED = true;

 const NAME = "PocketMine-MP";
-const BASE_VERSION = "3.25.3";
+const BASE_VERSION = "3.25.6";
 const IS_DEVELOPMENT_BUILD = false;
-const BUILD_NUMBER = 0;
 const BUILD_CHANNEL = "stable";
--- a/src/pocketmine/network/mcpe/NetworkBinaryStream.php
+++ b/src/pocketmine/network/mcpe/NetworkBinaryStream.php
@ -786,8 +786,10 @@ class NetworkBinaryStream extends BinaryStream{
 		$result->lastTouchedByPlayerID = $this->getEntityUniqueId();
 		$result->rotation = $this->getByte();
 		$result->mirror = $this->getByte();
-		$result->integrityValue = $this->getFloat();
-		$result->integritySeed = $this->getInt();
+		$result->animationMode = $this->getByte();
+		$result->animationSeconds = $this->getLFloat();
+		$result->integrityValue = $this->getLFloat();
+		$result->integritySeed = $this->getLInt();
 		$result->pivot = $this->getVector3();

 		return $result;
@ -805,8 +807,10 @@ class NetworkBinaryStream extends BinaryStream{
 		$this->putEntityUniqueId($structureSettings->lastTouchedByPlayerID);
 		$this->putByte($structureSettings->rotation);
 		$this->putByte($structureSettings->mirror);
-		$this->putFloat($structureSettings->integrityValue);
-		$this->putInt($structureSettings->integritySeed);
+		$this->putByte($structureSettings->animationMode);
+		$this->putLFloat($structureSettings->animationSeconds);
+		$this->putLFloat($structureSettings->integrityValue);
+		$this->putLInt($structureSettings->integritySeed);
 		$this->putVector3($structureSettings->pivot);
 	}

--- a/src/pocketmine/network/mcpe/protocol/types/StructureSettings.php
+++ b/src/pocketmine/network/mcpe/protocol/types/StructureSettings.php
@ -50,6 +50,10 @@ class StructureSettings{
 	public $rotation;
 	/** @var int */
 	public $mirror;
+	/** @var int */
+	public $animationMode;
+	/** @var float */
+	public $animationSeconds;
 	/** @var float */
 	public $integrityValue;
 	/** @var int */
--- a/src/pocketmine/plugin/ScriptPluginLoader.php
+++ b/src/pocketmine/plugin/ScriptPluginLoader.php
@ -23,13 +23,14 @@ declare(strict_types=1);

 namespace pocketmine\plugin;

+use pocketmine\utils\Utils;
+use function count;
 use function file;
+use function implode;
 use function is_file;
-use function preg_match;
 use function strlen;
 use function strpos;
 use function substr;
-use function trim;
 use const FILE_IGNORE_NEW_LINES;
 use const FILE_SKIP_EMPTY_LINES;

@ -60,30 +61,27 @@ class ScriptPluginLoader implements PluginLoader{
 			return null;
 		}

-		$data = [];
-
 		$insideHeader = false;
+
+		$docCommentLines = [];
 		foreach($content as $line){
-			if(!$insideHeader and strpos($line, "/**") !== false){
-				$insideHeader = true;
-			}
-
-			if(preg_match("/^[ \t]+\\*[ \t]+@([a-zA-Z]+)([ \t]+(.*))?$/", $line, $matches) > 0){
-				$key = $matches[1];
-				$content = trim($matches[3] ?? "");
-
-				if($key === "notscript"){
-					return null;
+			if(!$insideHeader){
+				if(strpos($line, "/**") !== false){
+					$insideHeader = true;
+				}else{
+					continue;
 				}
-
-				$data[$key] = $content;
 			}

-			if($insideHeader and strpos($line, "*/") !== false){
+			$docCommentLines[] = $line;
+
+			if(strpos($line, "*/") !== false){
 				break;
 			}
 		}
-		if($insideHeader){
+
+		$data = Utils::parseDocComment(implode("\n", $docCommentLines));
+		if(count($data) !== 0){
 			return new PluginDescription($data);
 		}

--- a/tests/phpstan/bootstrap.php
+++ b/tests/phpstan/bootstrap.php
@ -30,6 +30,10 @@ if(!defined('LEVELDB_ZLIB_RAW_COMPRESSION')){
 define('pocketmine\COMPOSER_AUTOLOADER_PATH', dirname(__DIR__, 2) . '/vendor/autoload.php');
 define('pocketmine\DATA', '');
 define('pocketmine\GIT_COMMIT', str_repeat('00', 20));
+define('pocketmine\BUILD_NUMBER', 0);
 define('pocketmine\PLUGIN_PATH', '');
 define('pocketmine\START_TIME', microtime(true));
 define('pocketmine\VERSION', '9.9.9');
+
+//opcache breaks PHPStan when dynamic reflection is used - see https://github.com/phpstan/phpstan-src/pull/801#issuecomment-978431013
+ini_set('opcache.enable', 'off');
--- a/tests/phpstan/configs/actual-problems.neon
+++ b/tests/phpstan/configs/actual-problems.neon
@ -495,6 +495,11 @@ parameters:
 			count: 2
 			path: ../../../src/pocketmine/PocketMine.php

+		-
+			message: "#^Cannot access offset 'build' on mixed\\.$#"
+			count: 3
+			path: ../../../src/pocketmine/PocketMine.php
+
 		-
 			message: "#^Cannot access offset 'git' on mixed\\.$#"
 			count: 2
--- a/tests/phpstan/configs/phpstan-bugs.neon
+++ b/tests/phpstan/configs/phpstan-bugs.neon
@ -80,6 +80,11 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/network/mcpe/protocol/DataPacket.php

+		-
+			message: "#^Parameter \\#1 \\$yamlString of class pocketmine\\\\plugin\\\\PluginDescription constructor expects array\\|string, array\\<string\\> given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/plugin/ScriptPluginLoader.php
+
 		-
 			message: "#^Dead catch \\- ReflectionException is never thrown in the try block\\.$#"
 			count: 2
--- a/tests/phpstan/configs/pthreads-bugs.neon
+++ b/tests/phpstan/configs/pthreads-bugs.neon
@ -1,7 +0,0 @@
-parameters:
-	ignoreErrors:
-		-
-			message: "#^Variable \\$GLOBALS in isset\\(\\) always exists and is not nullable\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/MemoryManager.php
-
Author	SHA1	Message	Date
Dylan K. Taylor	f95142f6b6	Release 3.25.6	2021-11-26 23:37:46 +00:00
Dylan K. Taylor	7ace24caab	Fixed borked build number this was a problem before the recent clean-up; the only reason it just decided to show now is because 2000+25 is valid PHP code, so PHP saved our asses.	2021-11-26 23:36:19 +00:00
Dylan K. Taylor	32f619ac49	3.25.6 is next	2021-11-26 23:20:48 +00:00
Dylan K. Taylor	1bb6ac4fb6	Release 3.25.5	2021-11-26 23:20:40 +00:00
Dylan K. Taylor	52a891ba73	shut	2021-11-26 22:32:25 +00:00
Dylan K. Taylor	71b813d4f9	Define pocketmine\BUILD_NUMBER from phar metadata this way we don't have to patch the code (no idea why we were doing that anyway).	2021-11-26 22:27:58 +00:00
Dylan K. Taylor	f2540a72ad	Backport improved make-release.php from PM4	2021-11-26 22:10:46 +00:00
Dylan K. Taylor	7e0f6c02a1	Updated build/php submodule to pmmp/php-build-scripts@a59722c676	2021-11-26 21:59:39 +00:00
Dylan K. Taylor	c023c02b6c	MemoryManager: Removed obsolete workaround for $GLOBALS not being defined on threads this was long since fixed, and everyone has since been forced to upgrade to pthreads 4.0.0, which definitely has the fix.	2021-11-24 23:57:55 +00:00
Dylan K. Taylor	adff561483	phpstan: go nuclear on OPcache when using dynamic reflection (which is the default), any time static reflection comes into play, bad shit starts to happen because of FileReadTrapStreamWrapper. I attempted to fix these issues (phpstan/phpstan-src#801) and failed miserably. So, to save the hassle, it's time to just remove OPcache from the picture (which, unfortunately, also means that PHPStan will not benefit from JIT).	2021-11-24 23:40:54 +00:00
Dylan K. Taylor	472ffb28ff	ScriptPluginLoader: use parseDocComment() instead of reinventing the wheel	2021-11-24 17:22:49 +00:00
Dylan K. Taylor	726c5652f7	ScriptPluginLoader: fixed reading @tags from non-docblock lines preceding the first docblock	2021-11-24 17:07:34 +00:00
Dylan K. Taylor	fc7d297f60	Added missing fields of StructureSettings	2021-11-21 20:51:35 +00:00
Dylan K. Taylor	7b4ef293bd	NetworkBinaryStream: fixed incorrect field types for StructureSettings	2021-11-21 20:49:00 +00:00
Dylan K. Taylor	3683884b9c	Updated build/php submodule to pmmp/php-build-scripts@7a2ab5b922	2021-11-20 18:27:43 +00:00
Dylan K. Taylor	db135788b9	Updated transient dependencies	2021-11-20 18:19:27 +00:00
dependabot[bot]	7210db25b0	Bump phpstan/phpstan from 1.1.2 to 1.2.0 (#4583 ) Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.1.2 to 1.2.0. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/master/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.1.2...1.2.0) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-11-19 14:42:01 +00:00
Dylan T	ada469bc45	README: do not show beta releases on badge [ci skip]	2021-11-12 01:35:39 +00:00
dependabot[bot]	dc8243f88b	Bump phpstan/phpstan from 1.1.1 to 1.1.2 (#4564 ) Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.1.1 to 1.1.2. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Commits](https://github.com/phpstan/phpstan/compare/1.1.1...1.1.2) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-11-12 00:24:23 +00:00
Dylan K. Taylor	1beec348f9	3.25.5 is next	2021-11-08 22:33:09 +00:00
Dylan K. Taylor	7306a2d939	Release 3.25.4	2021-11-08 22:33:08 +00:00
Dylan K. Taylor	4bf338f783	Player: fixed removeWindow() causing all other inventories to be unopenable	2021-11-08 22:29:14 +00:00
Dylan K. Taylor	255ff63fda	3.25.4 is next	2021-11-08 20:35:15 +00:00