mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-20 15:41:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/event/player/PlayerCreationEvent.php
This commit is contained in:
Dylan K. Taylor
2020-11-28 16:16:15 +00:00
parent 8cf589eedd ef034f2d68
commit 4439781124
4 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/event/player/PlayerCreationEvent.php
View File

@@ -36,9 +36,15 @@ class PlayerCreationEvent extends Event{
/** @var NetworkSession */
private $session;
/** @var string */
/**
* @var string
* @phpstan-var class-string<Player>
*/
private $baseClass = Player::class;
/** @var string */
/**
* @var string
* @phpstan-var class-string<Player>
*/
private $playerClass = Player::class;
public function __construct(NetworkSession $session){
@@ -59,6 +65,7 @@ class PlayerCreationEvent extends Event{
/**
* @return string
* @phpstan-return class-string<Player>
*/
public function getBaseClass(){
return $this->baseClass;
@@ -66,6 +73,7 @@ class PlayerCreationEvent extends Event{
/**
* @param string $class
* @phpstan-param class-string<Player> $class
*/
public function setBaseClass($class) : void{
if(!is_a($class, $this->baseClass, true)){
@@ -77,6 +85,7 @@ class PlayerCreationEvent extends Event{
/**
* @return string
* @phpstan-return class-string<Player>
*/
public function getPlayerClass(){
return $this->playerClass;
@@ -84,6 +93,7 @@ class PlayerCreationEvent extends Event{
/**
* @param string $class
* @phpstan-param class-string<Player> $class
*/
public function setPlayerClass($class) : void{
if(!is_a($class, $this->baseClass, true)){