Merge branch 'release/3.3'

This commit is contained in:
Dylan K. Taylor 2018-09-27 16:36:57 +01:00
commit 73f1480e10
2 changed files with 13 additions and 4 deletions

View File

@ -35,7 +35,7 @@ class OfflinePlayer implements IPlayer, Metadatable{
/** @var Server */ /** @var Server */
private $server; private $server;
/** @var CompoundTag|null */ /** @var CompoundTag|null */
private $namedtag; private $namedtag = null;
/** /**
* @param Server $server * @param Server $server
@ -44,10 +44,8 @@ class OfflinePlayer implements IPlayer, Metadatable{
public function __construct(Server $server, string $name){ public function __construct(Server $server, string $name){
$this->server = $server; $this->server = $server;
$this->name = $name; $this->name = $name;
if(file_exists($this->server->getDataPath() . "players/" . strtolower($this->name) . ".dat")){ if($this->server->hasOfflinePlayerData($this->name)){
$this->namedtag = $this->server->getOfflinePlayerData($this->name); $this->namedtag = $this->server->getOfflinePlayerData($this->name);
}else{
$this->namedtag = null;
} }
} }

View File

@ -738,6 +738,17 @@ class Server{
return $result; return $result;
} }
/**
* Returns whether the server has stored any saved data for this player.
*
* @param string $name
*
* @return bool
*/
public function hasOfflinePlayerData(string $name) : bool{
return file_exists($this->getDataPath() . "players/$name.dat");
}
/** /**
* @param string $name * @param string $name
* *