mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-07 04:17:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stable' into next-minor

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-03-14 13:42:39 +00:00
commit 47c7872c88
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

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

5
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "e22866a7924c444da73ff31b831b30cb", "content-hash": "0a965a0cd39d5b3dd7b0ee1f0abe009b",
"packages": [ "packages": [
{ {
"name": "adhocore/json-comment", "name": "adhocore/json-comment",
@ -609,5 +609,6 @@
"ext-zip": "*", "ext-zip": "*",
"ext-zlib": ">=1.2.11" "ext-zlib": ">=1.2.11"
}, },
"platform-dev": [] "platform-dev": [],
"plugin-api-version": "1.1.0"
} }

9
src/pocketmine/event/player/PlayerQuitEvent.php
View File

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