mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-23 11:26:37 +00:00
Code Issues Projects Releases Wiki Activity

Fixed player spawnpoints glitching and not saving

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-06-21 12:17:26 +01:00
parent 080b35bf53
commit 03826d9cbc
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pocketmine/Player.php
View File

@ -1849,8 +1849,12 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
protected function completeLoginSequence(){ protected function completeLoginSequence(){
parent::__construct($this->level, $this->namedtag); parent::__construct($this->level, $this->namedtag);
if(!$this->hasValidSpawnPosition() and isset($this->namedtag->SpawnLevel) and ($level = $this->server->getLevelByName((string) $this->namedtag["SpawnLevel"])) instanceof Level){ if(!$this->hasValidSpawnPosition()){
$this->spawnPosition = new WeakPosition($this->namedtag["SpawnX"], $this->namedtag["SpawnY"], $this->namedtag["SpawnZ"], $level); if(isset($this->namedtag->SpawnLevel) and ($level = $this->server->getLevelByName((string) $this->namedtag["SpawnLevel"])) instanceof Level){
$this->spawnPosition = new WeakPosition($this->namedtag["SpawnX"], $this->namedtag["SpawnY"], $this->namedtag["SpawnZ"], $level);
}else{
$this->spawnPosition = WeakPosition::fromObject($this->level->getSafeSpawn());
}
} }
$spawnPosition = $this->getSpawn(); $spawnPosition = $this->getSpawn();
@ -3754,10 +3758,10 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
} }
if($this->hasValidSpawnPosition()){ if($this->hasValidSpawnPosition()){
$this->namedtag["SpawnLevel"] = $this->spawnPosition->getLevel()->getFolderName(); $this->namedtag->SpawnLevel = new StringTag("SpawnLevel", $this->spawnPosition->getLevel()->getFolderName());
$this->namedtag["SpawnX"] = (int) $this->spawnPosition->x; $this->namedtag->SpawnX = new IntTag("SpawnX", (int) $this->spawnPosition->x);
$this->namedtag["SpawnY"] = (int) $this->spawnPosition->y; $this->namedtag->SpawnY = new IntTag("SpawnY", (int) $this->spawnPosition->y);
$this->namedtag["SpawnZ"] = (int) $this->spawnPosition->z; $this->namedtag->SpawnZ = new IntTag("SpawnZ", (int) $this->spawnPosition->z);
} }
foreach($this->achievements as $achievement => $status){ foreach($this->achievements as $achievement => $status){

5
src/pocketmine/command/defaults/SpawnpointCommand.php
View File

@ -26,6 +26,7 @@ namespace pocketmine\command\defaults;
use pocketmine\command\Command; use pocketmine\command\Command;
use pocketmine\command\CommandSender; use pocketmine\command\CommandSender;
use pocketmine\event\TranslationContainer; use pocketmine\event\TranslationContainer;
use pocketmine\level\Level;
use pocketmine\level\Position; use pocketmine\level\Position;
use pocketmine\Player; use pocketmine\Player;
use pocketmine\utils\TextFormat; use pocketmine\utils\TextFormat;
@ -70,8 +71,8 @@ class SpawnpointCommand extends VanillaCommand{
if(count($args) === 4){ if(count($args) === 4){
if($level !== null){ if($level !== null){
$pos = $sender instanceof Player ? $sender->getPosition() : $level->getSpawnLocation(); $pos = $sender instanceof Player ? $sender->getPosition() : $level->getSpawnLocation();
$x = (int) $this->getRelativeDouble($pos->x, $sender, $args[1]); $x = $this->getRelativeDouble($pos->x, $sender, $args[1]);
$y = $this->getRelativeDouble($pos->y, $sender, $args[2], 0, 128); $y = $this->getRelativeDouble($pos->y, $sender, $args[2], 0, Level::Y_MAX);
$z = $this->getRelativeDouble($pos->z, $sender, $args[3]); $z = $this->getRelativeDouble($pos->z, $sender, $args[3]);
$target->setSpawn(new Position($x, $y, $z, $level)); $target->setSpawn(new Position($x, $y, $z, $level));