mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-03 08:39:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '0029efa37'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Server.php
This commit is contained in:
Dylan K. Taylor 2020-06-14 19:36:50 +01:00
commit 13031967f4
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Server.php
View File

@ -500,23 +500,26 @@ class Server{
return $result; return $result;
} }
private function getPlayerDataPath(string $username) : string{
return $this->getDataPath() . '/players/' . strtolower($username) . '.dat';
}
/** /**
* Returns whether the server has stored any saved data for this player. * Returns whether the server has stored any saved data for this player.
*/ */
public function hasOfflinePlayerData(string $name) : bool{ public function hasOfflinePlayerData(string $name) : bool{
$name = strtolower($name); return file_exists($this->getPlayerDataPath($name));
return file_exists($this->getDataPath() . "players/$name.dat");
} }
public function getOfflinePlayerData(string $name) : ?CompoundTag{ public function getOfflinePlayerData(string $name) : ?CompoundTag{
$name = strtolower($name); $name = strtolower($name);
$path = $this->getDataPath() . "players/"; $path = $this->getPlayerDataPath($name);
if(file_exists($path . "$name.dat")){ if(file_exists($path)){
try{ try{
return (new BigEndianNbtSerializer())->readCompressed(file_get_contents($path . "$name.dat"))->mustGetCompoundTag(); return (new BigEndianNbtSerializer())->readCompressed(file_get_contents($path))->mustGetCompoundTag();
}catch(NbtDataException $e){ //zlib decode error / corrupt data }catch(NbtDataException $e){ //zlib decode error / corrupt data
rename($path . "$name.dat", $path . "$name.dat.bak"); rename($path, $path . '.bak');
$this->logger->error($this->getLanguage()->translateString("pocketmine.data.playerCorrupted", [$name])); $this->logger->error($this->getLanguage()->translateString("pocketmine.data.playerCorrupted", [$name]));
} }
} }
@ -532,7 +535,7 @@ class Server{
if(!$ev->isCancelled()){ if(!$ev->isCancelled()){
$nbt = new BigEndianNbtSerializer(); $nbt = new BigEndianNbtSerializer();
try{ try{
file_put_contents($this->getDataPath() . "players/" . strtolower($name) . ".dat", $nbt->writeCompressed(new TreeRoot($ev->getSaveData()))); file_put_contents($this->getPlayerDataPath($name), $nbt->writeCompressed(new TreeRoot($ev->getSaveData())));
}catch(\ErrorException $e){ }catch(\ErrorException $e){
$this->logger->critical($this->getLanguage()->translateString("pocketmine.data.saveError", [$name, $e->getMessage()])); $this->logger->critical($this->getLanguage()->translateString("pocketmine.data.saveError", [$name, $e->getMessage()]));
$this->logger->logException($e); $this->logger->logException($e);