From a86d3fe071605e238bcec0e7bebc8087185b5a6f Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 21 Jul 2018 18:42:18 +0100 Subject: [PATCH] PlayerCreationEvent: Remove useless crap from constructor --- .../event/player/PlayerCreationEvent.php | 20 +++---------------- .../network/mcpe/RakLibInterface.php | 2 +- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/src/pocketmine/event/player/PlayerCreationEvent.php b/src/pocketmine/event/player/PlayerCreationEvent.php index a7485a21b..38c061a2e 100644 --- a/src/pocketmine/event/player/PlayerCreationEvent.php +++ b/src/pocketmine/event/player/PlayerCreationEvent.php @@ -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; } /** diff --git a/src/pocketmine/network/mcpe/RakLibInterface.php b/src/pocketmine/network/mcpe/RakLibInterface.php index 4e0abca79..d3dc8b79d 100644 --- a/src/pocketmine/network/mcpe/RakLibInterface.php +++ b/src/pocketmine/network/mcpe/RakLibInterface.php @@ -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();