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

Player: re-structure a whole bunch of construction mess

Browse Source 
This consolidates the Player entity construction and makes it more organized and consistent. There is of course a lot more work to do apart from this on player construction.
This commit is contained in:
Dylan K. Taylor 2018-07-20 15:34:47 +01:00
parent 7633136a86
commit a4939b6bf1
1 changed files with 75 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
src/pocketmine/Player.php
View File

@ -1803,15 +1803,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
return ($targetDot - $eyeDot) >= -$maxDiff; return ($targetDot - $eyeDot) >= -$maxDiff;
} }
protected function initHumanData() : void{
$this->setNameTag($this->username);
}
protected function initEntity() : void{
parent::initEntity();
$this->addDefaultWindows();
}
public function handleLogin(LoginPacket $packet) : bool{ public function handleLogin(LoginPacket $packet) : bool{
if($this->loggedIn){ if($this->loggedIn){
return false; return false;
@ -1939,10 +1930,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
//TODO: encryption //TODO: encryption
$this->processLogin();
}
protected function processLogin(){
foreach($this->server->getLoggedInPlayers() as $p){ foreach($this->server->getLoggedInPlayers() as $p){
if($p !== $this and ($p->iusername === $this->iusername or $this->getUniqueId()->equals($p->getUniqueId()))){ if($p !== $this and ($p->iusername === $this->iusername or $this->getUniqueId()->equals($p->getUniqueId()))){
if(!$p->kick("logged in from another location")){ if(!$p->kick("logged in from another location")){
@ -1953,41 +1940,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
} }
} }
$this->namedtag = $this->server->getOfflinePlayerData($this->username);
$this->playedBefore = ($this->getLastPlayed() - $this->getFirstPlayed()) > 1; // microtime(true) - microtime(true) may have less than one millisecond difference
$this->namedtag->setString("NameTag", $this->username);
$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->allowFlight = $this->isCreative();
$this->keepMovement = $this->isSpectator() || $this->allowMovementCheats();
if(($level = $this->server->getLevelByName($this->namedtag->getString("Level", "", true))) === null){
$this->setLevel($this->server->getDefaultLevel());
$this->namedtag->setString("Level", $this->level->getFolderName());
$spawnLocation = $this->level->getSafeSpawn();
$this->namedtag->setTag(new ListTag("Pos", [
new DoubleTag("", $spawnLocation->x),
new DoubleTag("", $spawnLocation->y),
new DoubleTag("", $spawnLocation->z)
]));
}else{
$this->setLevel($level);
}
$this->achievements = [];
$achievements = $this->namedtag->getCompoundTag("Achievements") ?? [];
/** @var ByteTag $achievement */
foreach($achievements as $achievement){
$this->achievements[$achievement->getName()] = $achievement->getValue() !== 0;
}
$this->sendPlayStatus(PlayStatusPacket::LOGIN_SUCCESS); $this->sendPlayStatus(PlayStatusPacket::LOGIN_SUCCESS);
$this->loggedIn = true; $this->loggedIn = true;
@ -2036,7 +1988,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
$this->dataPacket($pk); $this->dataPacket($pk);
break; break;
case ResourcePackClientResponsePacket::STATUS_COMPLETED: case ResourcePackClientResponsePacket::STATUS_COMPLETED:
$this->completeLoginSequence(); $this->_actuallyConstruct();
break; break;
default: default:
return false; return false;
@ -2045,12 +1997,28 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
return true; return true;
} }
protected function completeLoginSequence(){ protected function _actuallyConstruct(){
/** @var float[] $pos */ $namedtag = $this->server->getOfflinePlayerData($this->username); //TODO: make this async
$pos = $this->namedtag->getListTag("Pos")->getAllValues();
$this->level->registerChunkLoader($this, ((int) floor($pos[0])) >> 4, ((int) floor($pos[2])) >> 4, true); if(($level = $this->server->getLevelByName($namedtag->getString("Level", "", true))) === null){
/** @var Level $level */
$level = $this->server->getDefaultLevel(); //TODO: default level may be null
$namedtag->setString("Level", $level->getFolderName());
$spawnLocation = $level->getSafeSpawn();
$namedtag->setTag(new ListTag("Pos", [
new DoubleTag("", $spawnLocation->x),
new DoubleTag("", $spawnLocation->y),
new DoubleTag("", $spawnLocation->z)
]));
}
/** @var float[] $pos */
$pos = $namedtag->getListTag("Pos")->getAllValues();
$level->registerChunkLoader($this, ((int) floor($pos[0])) >> 4, ((int) floor($pos[2])) >> 4, true);
parent::__construct($level, $namedtag);
parent::__construct($this->level, $this->namedtag);
$this->server->getPluginManager()->callEvent($ev = new PlayerLoginEvent($this, "Plugin reason")); $this->server->getPluginManager()->callEvent($ev = new PlayerLoginEvent($this, "Plugin reason"));
if($ev->isCancelled()){ if($ev->isCancelled()){
$this->close($this->getLeaveMessage(), $ev->getKickMessage()); $this->close($this->getLeaveMessage(), $ev->getKickMessage());
@ -2058,14 +2026,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
return; return;
} }
if(!$this->hasValidSpawnPosition()){
if(($level = $this->server->getLevelByName($this->namedtag->getString("SpawnLevel", ""))) instanceof Level){
$this->spawnPosition = new Position($this->namedtag->getInt("SpawnX"), $this->namedtag->getInt("SpawnY"), $this->namedtag->getInt("SpawnZ"), $level);
}else{
$this->spawnPosition = $this->level->getSafeSpawn();
}
}
$spawnPosition = $this->getSpawn(); $spawnPosition = $this->getSpawn();
$pk = new StartGamePacket(); $pk = new StartGamePacket();
@ -2097,25 +2057,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
$this->level->sendTime($this); $this->level->sendTime($this);
$this->sendAttributes(true); $this->sendAttributes(true);
$this->setNameTagVisible();
$this->setNameTagAlwaysVisible();
$this->setCanClimb();
$this->server->getLogger()->info($this->getServer()->getLanguage()->translateString("pocketmine.player.logIn", [
TextFormat::AQUA . $this->username . TextFormat::WHITE,
$this->networkSession->getIp(),
$this->networkSession->getPort(),
$this->id,
$this->level->getName(),
round($this->x, 4),
round($this->y, 4),
round($this->z, 4)
]));
if($this->isOp()){
$this->setRemoveFormat(false);
}
$this->sendCommandData(); $this->sendCommandData();
$this->sendSettings(); $this->sendSettings();
$this->sendPotionEffects($this); $this->sendPotionEffects($this);
@ -2128,6 +2069,59 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
$this->server->addOnlinePlayer($this); $this->server->addOnlinePlayer($this);
$this->server->sendFullPlayerListData($this); $this->server->sendFullPlayerListData($this);
$this->server->getLogger()->info($this->getServer()->getLanguage()->translateString("pocketmine.player.logIn", [
TextFormat::AQUA . $this->username . TextFormat::WHITE,
$this->networkSession->getIp(),
$this->networkSession->getPort(),
$this->id,
$this->level->getName(),
round($this->x, 4),
round($this->y, 4),
round($this->z, 4)
]));
}
protected function initHumanData() : void{
$this->setNameTag($this->username);
}
protected function initEntity() : void{
parent::initEntity();
$this->addDefaultWindows();
$this->playedBefore = ($this->getLastPlayed() - $this->getFirstPlayed()) > 1; // microtime(true) - microtime(true) may have less than one millisecond difference
$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());
$this->keepMovement = $this->isSpectator() || $this->allowMovementCheats();
if($this->isOp()){
$this->setRemoveFormat(false);
}
$this->setNameTagVisible();
$this->setNameTagAlwaysVisible();
$this->setCanClimb();
$this->achievements = [];
$achievements = $this->namedtag->getCompoundTag("Achievements") ?? [];
/** @var ByteTag $achievement */
foreach($achievements as $achievement){
$this->achievements[$achievement->getName()] = $achievement->getValue() !== 0;
}
if(!$this->hasValidSpawnPosition()){
if(($level = $this->server->getLevelByName($this->namedtag->getString("SpawnLevel", ""))) instanceof Level){
$this->spawnPosition = new Position($this->namedtag->getInt("SpawnX"), $this->namedtag->getInt("SpawnY"), $this->namedtag->getInt("SpawnZ"), $level);
}else{
$this->spawnPosition = $this->level->getSafeSpawn();
}
}
} }
/** /**