From c29723e3c4d6bbd2a1eec723e57aecc231b4509f Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 13 Aug 2018 13:18:58 +0100 Subject: [PATCH 1/2] OfflinePlayer: remove unnecessary strtolower() calls closes #2371 --- src/pocketmine/OfflinePlayer.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pocketmine/OfflinePlayer.php b/src/pocketmine/OfflinePlayer.php index fe11144a6..f0499d896 100644 --- a/src/pocketmine/OfflinePlayer.php +++ b/src/pocketmine/OfflinePlayer.php @@ -64,7 +64,7 @@ class OfflinePlayer implements IPlayer, Metadatable{ } public function isOp() : bool{ - return $this->server->isOp(strtolower($this->getName())); + return $this->server->isOp($this->getName()); } public function setOp(bool $value){ @@ -73,14 +73,14 @@ class OfflinePlayer implements IPlayer, Metadatable{ } if($value){ - $this->server->addOp(strtolower($this->getName())); + $this->server->addOp($this->getName()); }else{ - $this->server->removeOp(strtolower($this->getName())); + $this->server->removeOp($this->getName()); } } public function isBanned() : bool{ - return $this->server->getNameBans()->isBanned(strtolower($this->getName())); + return $this->server->getNameBans()->isBanned($this->getName()); } public function setBanned(bool $value){ @@ -92,14 +92,14 @@ class OfflinePlayer implements IPlayer, Metadatable{ } public function isWhitelisted() : bool{ - return $this->server->isWhitelisted(strtolower($this->getName())); + return $this->server->isWhitelisted($this->getName()); } public function setWhitelisted(bool $value){ if($value){ - $this->server->addWhitelist(strtolower($this->getName())); + $this->server->addWhitelist($this->getName()); }else{ - $this->server->removeWhitelist(strtolower($this->getName())); + $this->server->removeWhitelist($this->getName()); } } From 565373cee61da627b2de84247fe9474d35170b5d Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 13 Aug 2018 13:22:00 +0100 Subject: [PATCH 2/2] OfflinePlayer: remove unnecessary getName() usages --- src/pocketmine/OfflinePlayer.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/pocketmine/OfflinePlayer.php b/src/pocketmine/OfflinePlayer.php index f0499d896..60e197593 100644 --- a/src/pocketmine/OfflinePlayer.php +++ b/src/pocketmine/OfflinePlayer.php @@ -44,7 +44,7 @@ class OfflinePlayer implements IPlayer, Metadatable{ public function __construct(Server $server, string $name){ $this->server = $server; $this->name = $name; - if(file_exists($this->server->getDataPath() . "players/" . strtolower($this->getName()) . ".dat")){ + if(file_exists($this->server->getDataPath() . "players/" . strtolower($this->name) . ".dat")){ $this->namedtag = $this->server->getOfflinePlayerData($this->name); }else{ $this->namedtag = null; @@ -64,7 +64,7 @@ class OfflinePlayer implements IPlayer, Metadatable{ } public function isOp() : bool{ - return $this->server->isOp($this->getName()); + return $this->server->isOp($this->name); } public function setOp(bool $value){ @@ -73,38 +73,38 @@ class OfflinePlayer implements IPlayer, Metadatable{ } if($value){ - $this->server->addOp($this->getName()); + $this->server->addOp($this->name); }else{ - $this->server->removeOp($this->getName()); + $this->server->removeOp($this->name); } } public function isBanned() : bool{ - return $this->server->getNameBans()->isBanned($this->getName()); + return $this->server->getNameBans()->isBanned($this->name); } public function setBanned(bool $value){ if($value){ - $this->server->getNameBans()->addBan($this->getName(), null, null, null); + $this->server->getNameBans()->addBan($this->name, null, null, null); }else{ - $this->server->getNameBans()->remove($this->getName()); + $this->server->getNameBans()->remove($this->name); } } public function isWhitelisted() : bool{ - return $this->server->isWhitelisted($this->getName()); + return $this->server->isWhitelisted($this->name); } public function setWhitelisted(bool $value){ if($value){ - $this->server->addWhitelist($this->getName()); + $this->server->addWhitelist($this->name); }else{ - $this->server->removeWhitelist($this->getName()); + $this->server->removeWhitelist($this->name); } } public function getPlayer(){ - return $this->server->getPlayerExact($this->getName()); + return $this->server->getPlayerExact($this->name); } public function getFirstPlayed(){