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

Actually use iusername instead of repeatedly lowercasing player names (#811)

Browse Source 
#blameshoghi
This commit is contained in:
Luke | 14 2017-04-10 21:15:38 +01:00 committed by Dylan K. Taylor
parent dda47ee566
commit 80292c6c7a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pocketmine/Player.php
View File

@ -262,7 +262,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
} }
public function isBanned(){ public function isBanned(){
return $this->server->getNameBans()->isBanned(strtolower($this->getName())); return $this->server->getNameBans()->isBanned($this->iusername);
} }
public function setBanned($value){ public function setBanned($value){
@ -275,14 +275,14 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
} }
public function isWhitelisted(){ public function isWhitelisted(){
return $this->server->isWhitelisted(strtolower($this->getName())); return $this->server->isWhitelisted($this->iusername);
} }
public function setWhitelisted($value){ public function setWhitelisted($value){
if($value === true){ if($value === true){
$this->server->addWhitelist(strtolower($this->getName())); $this->server->addWhitelist($this->iusername);
}else{ }else{
$this->server->removeWhitelist(strtolower($this->getName())); $this->server->removeWhitelist($this->iusername);
} }
} }
@ -1667,11 +1667,11 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
} }
protected function processLogin(){ protected function processLogin(){
if(!$this->server->isWhitelisted(strtolower($this->getName()))){ if(!$this->server->isWhitelisted($this->iusername)){
$this->close($this->getLeaveMessage(), "Server is white-listed"); $this->close($this->getLeaveMessage(), "Server is white-listed");
return; return;
}elseif($this->server->getNameBans()->isBanned(strtolower($this->getName())) or $this->server->getIPBans()->isBanned($this->getAddress())){ }elseif($this->server->getNameBans()->isBanned($this->iusername) or $this->server->getIPBans()->isBanned($this->getAddress())){
$this->close($this->getLeaveMessage(), "You are banned"); $this->close($this->getLeaveMessage(), "You are banned");
return; return;
@ -1685,7 +1685,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
} }
foreach($this->server->getOnlinePlayers() as $p){ foreach($this->server->getOnlinePlayers() as $p){
if($p !== $this and strtolower($p->getName()) === strtolower($this->getName())){ if($p !== $this and $p->iusername === $this->iusername){
if($p->kick("logged in from another location") === false){ if($p->kick("logged in from another location") === false){
$this->close($this->getLeaveMessage(), "Logged in from another location"); $this->close($this->getLeaveMessage(), "Logged in from another location");
return; return;