mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-21 16:24:05 +00:00
Code Issues Projects Releases Wiki Activity

Player: clean up some runtime usages of NBT

Browse Source 
the goal is to get rid of this completely, but that's slightly complicated by the mess that is player creation right now.
This commit is contained in:
Dylan K. Taylor 2018-08-07 18:27:22 +01:00
parent 16b789a528
commit ec9ef891ee
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pocketmine/Player.php
View File

@ -203,8 +203,10 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
/** @var bool[] name of achievement => bool */
protected $achievements = [];
/** @var bool */
protected $playedBefore;
/** @var int */
protected $firstPlayed;
/** @var int */
protected $lastPlayed;
/** @var int */
protected $gamemode;
@ -358,15 +360,15 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
}
public function getFirstPlayed(){
return $this->namedtag instanceof CompoundTag ? $this->namedtag->getLong("firstPlayed", 0, true) : null;
return $this->firstPlayed;
}
public function getLastPlayed(){
return $this->namedtag instanceof CompoundTag ? $this->namedtag->getLong("lastPlayed", 0, true) : null;
return $this->lastPlayed;
}
public function hasPlayedBefore() : bool{
return $this->playedBefore;
return $this->lastPlayed - $this->firstPlayed > 1; // microtime(true) - microtime(true) may have less than one millisecond difference
}
public function setAllowFlight(bool $value){
@ -1307,7 +1309,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
$this->resetFallDistance();
$this->namedtag->setInt("playerGameType", $this->gamemode);
if(!$client){ //Gamemode changed by server, do not send for client changes
$this->sendGamemode();
}else{
@ -1891,12 +1892,12 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
parent::initEntity();
$this->addDefaultWindows();
$this->playedBefore = ($this->getLastPlayed() - $this->getFirstPlayed()) > 1; // microtime(true) - microtime(true) may have less than one millisecond difference
$this->firstPlayed = $this->namedtag->getLong("firstPlayed", $now = (int) (microtime(true) * 1000));
$this->lastPlayed = $this->namedtag->getLong("lastPlayed", $now);
$this->gamemode = $this->namedtag->getInt("playerGameType", self::SURVIVAL) & 0x03;
if($this->server->getForceGamemode()){
$this->gamemode = $this->server->getGamemode();
$this->namedtag->setInt("playerGameType", $this->gamemode);
}
$this->setAllowFlight($this->isCreative());
@ -2943,6 +2944,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
$this->namedtag->setTag($achievements);
$this->namedtag->setInt("playerGameType", $this->gamemode);
$this->namedtag->setLong("firstPlayed", $this->firstPlayed);
$this->namedtag->setLong("lastPlayed", (int) floor(microtime(true) * 1000));
$this->server->saveOfflinePlayerData($this->username, $this->namedtag, $async);