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

Remove redundant property from Player

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-10-01 12:19:11 +01:00
parent afa37bd2aa
commit ab5bbaa7bd
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pocketmine/Player.php
View File

@ -238,7 +238,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
protected $randomClientId; protected $randomClientId;
protected $connected = true;
protected $ip; protected $ip;
protected $removeFormat = true; protected $removeFormat = true;
protected $port; protected $port;
@ -518,7 +517,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
* @return bool * @return bool
*/ */
public function isOnline() : bool{ public function isOnline() : bool{
return $this->connected === true and $this->loggedIn === true; return $this->isConnected() and $this->loggedIn === true;
} }
/** /**
@ -692,7 +691,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
* @return bool * @return bool
*/ */
public function isConnected() : bool{ public function isConnected() : bool{
return $this->connected === true; return $this->sessionAdapter !== null;
} }
/** /**
@ -859,7 +858,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
} }
public function sendChunk(int $x, int $z, BatchPacket $payload){ public function sendChunk(int $x, int $z, BatchPacket $payload){
if($this->connected === false){ if(!$this->isConnected()){
return; return;
} }
@ -882,7 +881,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
} }
protected function sendNextChunk(){ protected function sendNextChunk(){
if($this->connected === false){ if(!$this->isConnected()){
return; return;
} }
@ -976,7 +975,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
} }
protected function orderChunks(){ protected function orderChunks(){
if($this->connected === false or $this->viewDistance === -1){ if(!$this->isConnected() or $this->viewDistance === -1){
return false; return false;
} }
@ -1074,7 +1073,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
* @return bool * @return bool
*/ */
public function batchDataPacket(DataPacket $packet) : bool{ public function batchDataPacket(DataPacket $packet) : bool{
if($this->connected === false){ if(!$this->isConnected()){
return false; return false;
} }
@ -1119,7 +1118,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
* @return bool|int * @return bool|int
*/ */
public function sendDataPacket(DataPacket $packet, bool $needACK = false, bool $immediate = false){ public function sendDataPacket(DataPacket $packet, bool $needACK = false, bool $immediate = false){
if($this->connected === false){ if(!$this->isConnected()){
return false; return false;
} }
@ -3248,7 +3247,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
* @param bool $notify * @param bool $notify
*/ */
final public function close($message = "", string $reason = "generic reason", bool $notify = true){ final public function close($message = "", string $reason = "generic reason", bool $notify = true){
if($this->connected and !$this->closed){ if($this->isConnected() and !$this->closed){
try{ try{
if($notify and strlen($reason) > 0){ if($notify and strlen($reason) > 0){
@ -3258,7 +3257,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
} }
$this->sessionAdapter = null; $this->sessionAdapter = null;
$this->connected = false;
$this->server->getPluginManager()->unsubscribeFromPermission(Server::BROADCAST_CHANNEL_USERS, $this); $this->server->getPluginManager()->unsubscribeFromPermission(Server::BROADCAST_CHANNEL_USERS, $this);
$this->server->getPluginManager()->unsubscribeFromPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this); $this->server->getPluginManager()->unsubscribeFromPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this);