From 24269bc35926ae1692e28f43576647d7058631b2 Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Sun, 13 Apr 2025 02:44:51 +0300 Subject: [PATCH] sendBuffer will add packet to recoveryQueue which should help to prevent the loss of some packets --- src/Player.php | 12 +++--------- src/pmf/PMFLevel.php | 13 +++++++------ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/Player.php b/src/Player.php index 6bda217f..87120d29 100755 --- a/src/Player.php +++ b/src/Player.php @@ -420,6 +420,8 @@ class Player{ public function sendBuffer(){ if($this->bufferLen > 0 and $this->buffer instanceof RakNetPacket){ $this->buffer->seqNumber = $this->counter[0]++; + $this->recoveryQueue[$this->buffer->seqNumber] = $this->buffer; + $this->buffer->sendtime = microtime(true); $this->send($this->buffer); } $this->bufferLen = 0; @@ -963,15 +965,6 @@ class Player{ } if($m !== ""){ - - /*$pk = new LevelEventPacket(); - $pk->evid = LevelEventPacket::EVENT_OPEN_DOOR_SOUND; - $pk->x = $this->entity->x; - $pk->y = $this->entity->y; - $pk->z = $this->entity->z; - $pk->data = 0; - $this->dataPacket($pk);*/ - $pk = new MessagePacket; $pk->source = ($author instanceof Player) ? $author->username : $author; $pk->message = TextFormat::clean($m); //Colors not implemented :( @@ -2800,6 +2793,7 @@ class Player{ switch($packet->pid()){ case RakNetInfo::NACK: foreach($packet->packets as $count){ + if(isset($this->recoveryQueue[$count])){ $this->resendQueue[$count] =& $this->recoveryQueue[$count]; $this->lag[] = $time - $this->recoveryQueue[$count]->sendtime; diff --git a/src/pmf/PMFLevel.php b/src/pmf/PMFLevel.php index 6f8bd200..f00388e6 100644 --- a/src/pmf/PMFLevel.php +++ b/src/pmf/PMFLevel.php @@ -353,13 +353,14 @@ class PMFLevel extends PMF{ } public function getBlockID($x, $y, $z){ + if($y > 127 || $y < 0){ + return 0; + } + if($x < 0 || $x > 255 || $z < 0 || $z > 255){ return INVISIBLE_BEDROCK; } - if($y > 127 || $y < 0){ - return 0; - } $X = $x >> 4; $Z = $z >> 4; $Y = $y >> 4; @@ -460,12 +461,12 @@ class PMFLevel extends PMF{ } public function getBlock($x, $y, $z){ - if($x < 0 || $x > 255 || $z < 0 || $z > 255){ - return [INVISIBLE_BEDROCK, 0]; - } if($y < 0 || $y > 127){ return [AIR, 0]; } + if($x < 0 || $x > 255 || $z < 0 || $z > 255){ + return [INVISIBLE_BEDROCK, 0]; + } $X = $x >> 4; $Z = $z >> 4;