mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-14 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

PlayerCreationEvent: Remove useless crap from constructor

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-07-21 18:42:18 +01:00
parent b93318b2cf
commit a86d3fe071
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pocketmine/event/player/PlayerCreationEvent.php
View File

@ -39,33 +39,19 @@ class PlayerCreationEvent extends Event{
private $port;
/** @var Player::class */
private $baseClass;
private $baseClass = Player::class;
/** @var Player::class */
private $playerClass;
private $playerClass = Player::class;
/**
* @param NetworkInterface $interface
* @param Player::class $baseClass
* @param Player::class $playerClass
* @param string $address
* @param int $port
*/
public function __construct(NetworkInterface $interface, $baseClass, $playerClass, string $address, int $port){
public function __construct(NetworkInterface $interface, string $address, int $port){
$this->interface = $interface;
$this->address = $address;
$this->port = $port;
if(!is_a($baseClass, Player::class, true)){
throw new \RuntimeException("Base class $baseClass must extend " . Player::class);
}
$this->baseClass = $baseClass;
if(!is_a($playerClass, Player::class, true)){
throw new \RuntimeException("Class $playerClass must extend " . Player::class);
}
$this->playerClass = $playerClass;
}
/**

2
src/pocketmine/network/mcpe/RakLibInterface.php
View File

@ -131,7 +131,7 @@ class RakLibInterface implements ServerInstance, AdvancedNetworkInterface{
}
public function openSession(string $identifier, string $address, int $port, int $clientID) : void{
$ev = new PlayerCreationEvent($this, Player::class, Player::class, $address, $port);
$ev = new PlayerCreationEvent($this, $address, $port);
$this->server->getPluginManager()->callEvent($ev);
$class = $ev->getPlayerClass();