Merge branch 'stable'

This commit is contained in:
Dylan K. Taylor
2021-10-29 19:04:01 +01:00
4 changed files with 11 additions and 3 deletions

View File

@ -394,7 +394,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
}
public function spawnTo(Player $player) : void{
if($this->isAlive() and $player->isAlive() and $player->getWorld() === $this->getWorld() and $player->canSee($this) and !$this->isSpectator()){
if($this->isAlive() and $player->isAlive() and $player->canSee($this) and !$this->isSpectator()){
parent::spawnTo($player);
}
}