diff --git a/src/Player.php b/src/Player.php index a37ed96c..ccfb1b05 100755 --- a/src/Player.php +++ b/src/Player.php @@ -1,6 +1,7 @@ blockUpdateQueue = new RakNetPacket(RakNetInfo::DATA_PACKET_0); $this->blockUpdateQueue->data = []; + $this->chatMessagesQueue = new RakNetPacket(RakNetInfo::DATA_PACKET_0); + $this->chatMessagesQueue->data = []; + //$this->server->schedule(20 * 60, [$this, "clearQueue"], [], true); $this->evid[] = $this->server->event("server.close", [$this, "close"]); @@ -1038,7 +1050,7 @@ class Player{ $pk = new MessagePacket; $pk->source = ($author instanceof Player) ? $author->username : $author; $pk->message = TextFormat::clean($m); //Colors not implemented :( - $this->dataPacket($pk); + $this->sendChatMessagePacket($pk); } } } @@ -1293,6 +1305,10 @@ class Player{ } } + if($this->chatMessagesQueueLength > 0 && $this->server->ticks % 5 == 0){ //send 4 times/second + $this->sendChatBuffer(); + } + if($this->bufferLen > 0){ $this->sendBuffer(); } @@ -1322,6 +1338,20 @@ class Player{ } } } + + public function sendChatBuffer(){ + if($this->chatMessagesQueueLength > 0 && $this->chatMessagesQueue instanceof RakNetPacket){ + $this->chatMessagesQueue->seqNumber = $this->counter[0]++; + $this->packetAlwaysRecoverQueue[$this->chatMessagesQueue->seqNumber] = $this->chatMessagesQueue; + $this->chatMessagesQueue->sendtime = microtime(true); + $this->send($this->chatMessagesQueue); + } + + $this->chatMessagesQueueLength = 0; + $this->chatMessagesQueue = new RakNetPacket(RakNetInfo::DATA_PACKET_0); + $this->chatMessagesQueue->data = []; + } + public function sendEntityMovementUpdateQueue(){ if($this->entityMovementQueueLength > 0 && $this->entityMovementQueue instanceof RakNetPacket){ $this->entityMovementQueue->seqNumber = $this->counter[0]++; @@ -1541,13 +1571,8 @@ class Player{ } public function directDataPacket(RakNetDataPacket $packet, $reliability = 0, $recover = true){ - if($this->connected === false){ - return false; - } - - if(EventHandler::callEvent(new DataPacketSendEvent($this, $packet)) === BaseEvent::DENY){ - return []; - } + if($this->connected === false) return false; + if(EventHandler::callEvent(new DataPacketSendEvent($this, $packet)) === BaseEvent::DENY) return []; $packet->encode(); $pk = new RakNetPacket(RakNetInfo::DATA_PACKET_0); @@ -1561,6 +1586,26 @@ class Player{ $this->send($pk); return [$pk->seqNumber]; } + + public function sendChatMessagePacket(RakNetDataPacket $packet){ + if($this->connected === false) return false; + if(EventHandler::callEvent(new DataPacketSendEvent($this, $packet)) === BaseEvent::DENY) return false; + + $packet->encode(); + $len = strlen($packet->buffer) + 1; + $MTU = $this->MTU - 24; + + if(($this->chatMessagesQueueLength + $len) >= $MTU) $this->sendChatBuffer(); + + $packet->reliability = 3; + $packet->messageIndex = $this->counter[3]++; + $packet->orderChannel = Player::CHATMESSAGE_ORDER_CHANNEL; + $packet->orderIndex = $this->chatMessagesOrderIndex++; + $this->chatMessagesQueue->data[] = $packet; + $this->chatMessagesQueueLength += 10+$len; //reliability(1)+lenbits(2)+messageindex(3)+orderChannel(1)+orderIndex(3) = 10 + return true; + } + public function entityTick(){ if($this->isSleeping) ++$this->sleepingTime; if($this->server->difficulty == 0 && $this->entity->counter % (20 * 15) == 0){ diff --git a/src/entity/Entity.php b/src/entity/Entity.php index 99217779..68dffc21 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -146,7 +146,6 @@ class Entity extends Position $this->name = ""; $this->gravity = 0.08; $this->state = $this->data["State"] = $this->data["State"] ?? 0; - $this->tickCounter = 0; $this->x = isset($this->data["x"]) ? (float) $this->data["x"] : 0; $this->y = isset($this->data["y"]) ? (float) $this->data["y"] : 0; $this->z = isset($this->data["z"]) ? (float) $this->data["z"] : 0; diff --git a/src/entity/object/Painting.php b/src/entity/object/Painting.php index 0e64a00a..6a49d48a 100644 --- a/src/entity/object/Painting.php +++ b/src/entity/object/Painting.php @@ -41,14 +41,14 @@ class Painting extends Entity{ } } - public $counter = 0; + public $scounter = 0; public function update($now){ if($this->closed === true){ return false; } - if(++$this->counter >= 100){ - $this->counter = 0; + if(++$this->scounter >= 100){ + $this->scounter = 0; if(!$this->survives() && !$this->dead){ //maybe dont check entity collision? $this->makeDead("nosurvive"); }