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

Server: fixed getOfflinePlayerData() trying to load terrain (?!?!?!?), closes #2725

Browse Source 
getOfflinePlayerData() will now return NULL if there is no stored data for a given player. The responsibility of checking the spawn point is now delegated to the Player, after it registers a chunk loader on its spawn chunk.
This commit is contained in:
Dylan K. Taylor
2019-02-01 15:16:03 +00:00
parent 3e58708130
commit ad6ae20d6b
3 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/pocketmine/Server.php
View File

@ -648,31 +648,21 @@ class Server{
/**
* @param string $name
*
* @return CompoundTag
* @return CompoundTag|null
*/
public function getOfflinePlayerData(string $name) : CompoundTag{
public function getOfflinePlayerData(string $name) : ?CompoundTag{
$name = strtolower($name);
$path = $this->getDataPath() . "players/";
if($this->shouldSavePlayerData()){
if(file_exists($path . "$name.dat")){
try{
return (new BigEndianNbtSerializer())->readCompressed(file_get_contents($path . "$name.dat"));
}catch(NbtDataException $e){ //zlib decode error / corrupt data
rename($path . "$name.dat", $path . "$name.dat.bak");
$this->logger->error($this->getLanguage()->translateString("pocketmine.data.playerCorrupted", [$name]));
}
if(file_exists($path . "$name.dat")){
try{
return (new BigEndianNbtSerializer())->readCompressed(file_get_contents($path . "$name.dat"));
}catch(NbtDataException $e){ //zlib decode error / corrupt data
rename($path . "$name.dat", $path . "$name.dat.bak");
$this->logger->error($this->getLanguage()->translateString("pocketmine.data.playerCorrupted", [$name]));
}
$this->logger->notice($this->getLanguage()->translateString("pocketmine.data.playerNotFound", [$name]));
}
$spawn = $this->levelManager->getDefaultLevel()->getSafeSpawn();
$nbt = EntityFactory::createBaseNBT($spawn);
$nbt->setString("Level", $this->levelManager->getDefaultLevel()->getFolderName());
$nbt->setByte("OnGround", 1); //TODO: this hack is needed for new players in-air ticks - they don't get detected as on-ground until they move
//TODO: old code had a TODO for SpawnForced
return $nbt;
return null;
}
/**