Merge tag '3.11.7'

build/server-phar.php

@@ -130,9 +130,13 @@ function main() : void{
 		exit(1);
 	}
 
-	$opts = getopt("", ["out:"]);
-	$gitHash = Git::getRepositoryStatePretty(dirname(__DIR__));
-	echo "Git hash detected as $gitHash" . PHP_EOL;
+	$opts = getopt("", ["out:", "git:"]);
+	if(isset($opts["git"])){
+		$gitHash = $opts["git"];
+	}else{
+		$gitHash = Git::getRepositoryStatePretty(dirname(__DIR__));
+		echo "Git hash detected as $gitHash" . PHP_EOL;
+	}
 	foreach(buildPhar(
 		$opts["out"] ?? getcwd() . DIRECTORY_SEPARATOR . "PocketMine-MP.phar",
 		dirname(__DIR__) . DIRECTORY_SEPARATOR,

changelogs/3.11.md

@@ -79,3 +79,19 @@ Plugin developers should **only** update their required API to this version if y
 - `ThreadManager` is now lazily initialized.
 - Removed raw NBT storage from `Item` internals. The following methods are now deprecated:
   - `Item::setCompoundTag()`
+
+# 3.11.7
+- Build system: Fixed crash reports of Jenkins builds being rejected by the crash archive as invalid.
+- Introduced a new dependency on `pocketmine/log-pthreads`, which contains classes separated from `pocketmine/log`.
+- Fixed minimum composer stability preventing any newer version of `pocketmine/pocketmine-mp` being installed than 3.3.4 by replacing `daverandom/callback-validator` with [`pocketmine/callback-validator`](https://github.com/pmmp/CallbackValidator).
+- Fixed every player seeing eating particles when any player eats.
+- Fixed setting held item not working during `BlockBreakEvent`, `PlayerInteractEvent` and `EntityDamageEvent`.
+- Fixed some incorrect documented types in `PlayerQuitEvent` reported by PHPStan.
+- Fixed documentation of `Item->pop()` return value.
+- Fixed server crash on encountering corrupted compressed data stored in region files.
+- Protocol: Split screen header is now properly accounted for during decoding. Note that split screen is still not supported natively, but their packets can be decoded properly now.
+- Protocol: Fixed wrong order of fields in `UpdateTradePacket`.
+- Protocol: Fixed loss of `fullSkinId` when decoding network skins.
+- Fixed RCON not being able to bind to port after a fast server restart.
+
+

composer.lock

@@ -671,11 +671,11 @@
     "packages-dev": [
         {
             "name": "irstea/phpunit-shim",
-            "version": "8.5.2",
+            "version": "8.5.3",
             "source": {
                 "type": "git",
                 "url": "https://gitlab.irstea.fr/pole-is/tools/phpunit-shim.git",
-                "reference": "8ec63f895972681271191821a36f9081c236b993"
+                "reference": "b55d058d7ad3cf516068f22138a5b8fb724605db"
             },
             "require": {
                 "ext-dom": "*",
@@ -721,7 +721,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2020-01-23T13:39:47+00:00"
+            "time": "2020-04-01T02:21:12+00:00"
         },
         {
             "name": "phpstan/phpstan",
@@ -760,20 +760,6 @@
                 "MIT"
             ],
             "description": "PHPStan - PHP Static Analysis Tool",
-            "funding": [
-                {
-                    "url": "https://github.com/ondrejmirtes",
-                    "type": "github"
-                },
-                {
-                    "url": "https://www.patreon.com/phpstan",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-03-22T16:51:47+00:00"
         },
         {
@@ -925,6 +911,5 @@
         "ext-zip": "*",
         "ext-zlib": ">=1.2.11"
     },
-    "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "platform-dev": []
 }

phpstan.neon.dist

@@ -36,6 +36,8 @@ parameters:
 		- tests/phpstan/stubs/JsonMapper.stub
 		- tests/phpstan/stubs/pthreads.stub
 	reportUnmatchedIgnoredErrors: false #no other way to silence platform-specific non-warnings
+	staticReflectionClassNamePatterns:
+		- "#^COM$#"
 	ignoreErrors:
 		-
 			message: "#^Instanceof between pocketmine\\\\plugin\\\\PluginManager and pocketmine\\\\plugin\\\\PluginManager will always evaluate to true\\.$#"