mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-29 14:49:59 +00:00
Code Issues Projects Releases Wiki Activity

Removed a condition that's been useless almost since the beginning of PocketMine

Browse Source 
This condition has been useless since before NBT was introduced to PocketMine.
If there was a use for it, it should have been placed BEFORE anything attempted to read from the NBT.

However, Server now handles bad data automatically now, so Server->getOfflinePlayerData() will never _not_ return a CompoundTag. Hence I've added a CompoundTag type-hint.
This commit is contained in:
Dylan K. Taylor 2017-03-26 13:20:46 +01:00
parent 4245274aec
commit dda8c6cc8f
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pocketmine/Player.php
View File

@ -1751,6 +1751,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
} }
$nbt = $this->server->getOfflinePlayerData($this->username); $nbt = $this->server->getOfflinePlayerData($this->username);
$this->playedBefore = ($nbt["lastPlayed"] - $nbt["firstPlayed"]) > 1; // microtime(true) - microtime(true) may have less than one millisecond difference $this->playedBefore = ($nbt["lastPlayed"] - $nbt["firstPlayed"]) > 1; // microtime(true) - microtime(true) may have less than one millisecond difference
if(!isset($nbt->NameTag)){ if(!isset($nbt->NameTag)){
$nbt->NameTag = new StringTag("NameTag", $this->username); $nbt->NameTag = new StringTag("NameTag", $this->username);
@ -1775,12 +1776,6 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
$this->setLevel($level); $this->setLevel($level);
} }
if(!($nbt instanceof CompoundTag)){
$this->close($this->getLeaveMessage(), "Invalid data");
return;
}
$this->achievements = []; $this->achievements = [];
/** @var ByteTag $achievement */ /** @var ByteTag $achievement */

2
src/pocketmine/Server.php
View File

@ -701,7 +701,7 @@ class Server{
* *
* @return CompoundTag * @return CompoundTag
*/ */
public function getOfflinePlayerData($name){ public function getOfflinePlayerData($name) : CompoundTag{
$name = strtolower($name); $name = strtolower($name);
$path = $this->getDataPath() . "players/"; $path = $this->getDataPath() . "players/";
if($this->shouldSavePlayerData()){ if($this->shouldSavePlayerData()){