mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-08 02:42:58 +00:00
Code Issues Projects Releases Wiki Activity

Added PlayerInfo, Player is no longer accessible during PlayerPreLoginEvent

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-01-13 19:32:30 +00:00
parent d2082c0383
commit 9c53b41851
6 changed files with 191 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/pocketmine/event/player/PlayerPreLoginEvent.php
View File

@ -23,7 +23,8 @@ declare(strict_types=1);
namespace pocketmine\event\player;
use pocketmine\Player;
use pocketmine\event\Event;
use pocketmine\PlayerInfo;
use function array_keys;
/**
@ -35,11 +36,8 @@ use function array_keys;
*
* WARNING: Any information about the player CANNOT be trusted at this stage, because they are not authenticated and
* could be a hacker posing as another player.
*
* WARNING: Due to internal bad architecture, the player is not fully constructed at this stage, and errors might occur
* when calling API methods on the player. Tread with caution.
*/
class PlayerPreLoginEvent extends PlayerEvent{
class PlayerPreLoginEvent extends Event{
public const KICK_REASON_PLUGIN = 0;
public const KICK_REASON_SERVER_FULL = 1;
public const KICK_REASON_SERVER_WHITELISTED = 2;
@ -52,6 +50,12 @@ class PlayerPreLoginEvent extends PlayerEvent{
self::KICK_REASON_BANNED
];
/** @var PlayerInfo */
private $playerInfo;
/** @var string */
private $ip;
/** @var int */
private $port;
/** @var bool */
protected $authRequired;
@ -59,14 +63,43 @@ class PlayerPreLoginEvent extends PlayerEvent{
protected $kickReasons = [];
/**
* @param Player $player
* @param bool $authRequired
* @param PlayerInfo $playerInfo
* @param string $ip
* @param int $port
* @param bool $authRequired
*/
public function __construct(Player $player, bool $authRequired){
$this->player = $player;
public function __construct(PlayerInfo $playerInfo, string $ip, int $port, bool $authRequired){
$this->playerInfo = $playerInfo;
$this->ip = $ip;
$this->port = $port;
$this->authRequired = $authRequired;
}
/**
* Returns an object containing self-proclaimed information about the connecting player.
* WARNING: THE PLAYER IS NOT VERIFIED DURING THIS EVENT. At this point, it's unknown if the player is real or a
* hacker.
*
* @return PlayerInfo
*/
public function getPlayerInfo() : PlayerInfo{
return $this->playerInfo;
}
/**
* @return string
*/
public function getIp() : string{
return $this->ip;
}
/**
* @return int
*/
public function getPort() : int{
return $this->port;
}
/**
* @return bool
*/