sleeping rewritten(+ fix 73)

This commit is contained in:
GameHerobrine 2023-10-08 20:03:37 +03:00
parent b969b5d8f1
commit 37b3c02396
3 changed files with 31 additions and 22 deletions

View file

@ -50,10 +50,11 @@ class Player{
private $port;
private $counter = [0, 0, 0, 0];
private $username;
private $iusername;
public $iusername;
private $eid = false;
private $startAction = false;
private $isSleeping = false;
public $isSleeping = false;
public $sleepingTime = 0;
private $chunksOrder = [];
private $lastMeasure = 0;
private $bandwidthRaw = 0;
@ -125,12 +126,12 @@ class Player{
}
}
$this->isSleeping = $pos;
$this->sleepingTime = 0;
$this->teleport(new Position($pos->x + 0.5, $pos->y + 1, $pos->z + 0.5, $this->level), false, false, false, false);
if($this->entity instanceof Entity){
$this->entity->updateMetadata();
}
$this->setSpawn($pos);
$this->server->schedule(60, [$this, "checkSleep"]);
return true;
}
@ -605,23 +606,6 @@ class Player{
$pk->hotbar = $hotbar;
$this->dataPacket($pk);
}
public function checkSleep(){
if($this->isSleeping !== false){
if($this->server->api->time->getPhase($this->level) === "night"){
foreach($this->server->api->player->getAll($this->level) as $p){
if($p->isSleeping === false){
return false;
}
}
$this->server->api->time->set("day", $this->level);
foreach($this->server->api->player->getAll($this->level) as $p){
$p->stopSleep();
}
}
}
}
/**
* @param $type
* @param $damage
@ -1261,7 +1245,9 @@ class Player{
$this->send($pk);
return [$pk->seqNumber];
}
public function entityTick(){
if($this->isSleeping) ++$this->sleepingTime;
}
public function handleDataPacket(RakNetDataPacket $packet){
if($this->connected === false){
return;
@ -2241,6 +2227,7 @@ class Player{
public function stopSleep(){
$this->isSleeping = false;
$this->sleepingTime = 0;
if($this->entity instanceof Entity){
$this->entity->updateMetadata();
}