Merge branch 'stable' into next-minor

composer.json

@@ -36,7 +36,7 @@
       "adhocore/json-comment": "^0.1.0"
    },
    "require-dev": {
-      "phpstan/phpstan": "^0.12.9",
+      "phpstan/phpstan": "^0.12.14",
       "irstea/phpunit-shim": "^8.5",
       "phpstan/phpstan-phpunit": "^0.12.6",
       "phpstan/phpstan-strict-rules": "^0.12.2"

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": "e22866a7924c444da73ff31b831b30cb",
+    "content-hash": "0a965a0cd39d5b3dd7b0ee1f0abe009b",
     "packages": [
         {
             "name": "adhocore/json-comment",
@@ -609,5 +609,6 @@
         "ext-zip": "*",
         "ext-zlib": ">=1.2.11"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
 }

src/pocketmine/event/player/PlayerQuitEvent.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\event\player;
 
+use pocketmine\lang\TextContainer;
 use pocketmine\lang\TranslationContainer;
 use pocketmine\Player;
 
@@ -31,13 +32,13 @@ use pocketmine\Player;
  */
 class PlayerQuitEvent extends PlayerEvent{
 
-	/** @var TranslationContainer|string */
+	/** @var TextContainer|string */
 	protected $quitMessage;
 	/** @var string */
 	protected $quitReason;
 
 	/**
-	 * @param TranslationContainer|string $quitMessage
+	 * @param TextContainer|string $quitMessage
 	 */
 	public function __construct(Player $player, $quitMessage, string $quitReason){
 		$this->player = $player;
@@ -46,14 +47,14 @@ class PlayerQuitEvent extends PlayerEvent{
 	}
 
 	/**
-	 * @param TranslationContainer|string $quitMessage
+	 * @param TextContainer|string $quitMessage
 	 */
 	public function setQuitMessage($quitMessage) : void{
 		$this->quitMessage = $quitMessage;
 	}
 
 	/**
-	 * @return TranslationContainer|string
+	 * @return TextContainer|string
 	 */
 	public function getQuitMessage(){
 		return $this->quitMessage;