From d5a38220bf4aa3a8e85d3c8ee45773f7b6b5572a Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Thu, 4 Jul 2024 06:31:44 +0300 Subject: [PATCH] server will try reading packets until none left(or limit is reached) --- src/API/ServerAPI.php | 2 ++ src/PocketMinecraftServer.php | 23 +++++++++++++++++++---- src/network/UDPSocket.php | 2 +- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/API/ServerAPI.php b/src/API/ServerAPI.php index a9d3589a..3df1cf5c 100644 --- a/src/API/ServerAPI.php +++ b/src/API/ServerAPI.php @@ -136,11 +136,13 @@ class ServerAPI{ "rcon.password" => substr(base64_encode(Utils::getRandomBytes(20, false)), 3, 10), "auto-save" => true, "enable-mob-ai" => true, + "abort-reading-after-N-packets" => PocketMinecraftServer::$PACKET_READING_LIMIT ]); $this->parseProperties(); MobSpawner::$MOB_LIMIT = $this->getProperty("mobs-amount", 50); Entity::$allowedAI = $this->getProperty("enable-mob-ai", true); + PocketMinecraftServer::$PACKET_READING_LIMIT = $this->getProperty("abort-reading-after-N-packets", PocketMinecraftServer::$PACKET_READING_LIMIT); //Load advanced properties define("DEBUG", $this->getProperty("debug", 1)); define("ADVANCED_CACHE", false); diff --git a/src/PocketMinecraftServer.php b/src/PocketMinecraftServer.php index 6565cf56..c19754a7 100644 --- a/src/PocketMinecraftServer.php +++ b/src/PocketMinecraftServer.php @@ -11,7 +11,7 @@ class PocketMinecraftServer{ private $serverip, $evCnt, $handCnt, $events, $eventsID, $handlers, $serverType, $lastTick, $memoryStats, $async = [], $asyncID = 0; public $doTick, $levelData, $tiles, $entities, $schedule, $scheduleCnt, $whitelist, $spawn, $difficulty, $stop, $asyncThread; - public static $FORCE_20_TPS = false, $KEEP_CHUNKS_LOADED = true; + public static $FORCE_20_TPS = false, $KEEP_CHUNKS_LOADED = true, $PACKET_READING_LIMIT = 100; function __construct($name, $gamemode = SURVIVAL, $seed = false, $port = 19132, $serverip = "0.0.0.0"){ $this->port = (int) $port; $this->doTick = true; @@ -473,19 +473,34 @@ class PocketMinecraftServer{ public function process() { $lastLoop = 0; - if(self::$FORCE_20_TPS){ while($this->stop === false){ - $packet = $this->interface->readPacket(); - if($packet instanceof Packet) $this->packetHandler($packet); + $packetcnt = 0; + while($packet = $this->interface->readPacket()){ + if($packet instanceof Packet) { + $this->packetHandler($packet); + if(++$packetcnt > self::$PACKET_READING_LIMIT){ + ConsoleAPI::warn("Reading more than ".self::$PACKET_READING_LIMIT." packets per tick! Forcing ticking!"); + break; + } + } + } + $this->tick(); } }else{ while($this->stop === false){ + $packetcnt = 0; + startReadingAgain: $packet = $this->interface->readPacket(); if($packet instanceof Packet){ $this->packetHandler($packet); $lastLoop = 0; + if(++$packetcnt > self::$PACKET_READING_LIMIT){ + ConsoleAPI::warn("Reading more than ".self::$PACKET_READING_LIMIT." packets per tick! Forcing ticking!"); + }else{ + goto startReadingAgain; + } } elseif($this->tick() > 0){ $lastLoop = 0; } else{ diff --git a/src/network/UDPSocket.php b/src/network/UDPSocket.php index 01d4a318..15cf0b3c 100644 --- a/src/network/UDPSocket.php +++ b/src/network/UDPSocket.php @@ -42,7 +42,7 @@ class UDPSocket{ if($this->connected === false){ return false; } - return @socket_recvfrom($this->sock, $buf, 65535, 0, $source, $port);; + return @socket_recvfrom($this->sock, $buf, 65535, 0, $source, $port); } public function write($data, $dest, $port){