From 66bc178238d4a5604a437326e95fed233d5d20c6 Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Sun, 13 Apr 2025 06:37:55 +0300 Subject: [PATCH] mtu size increased, block updates queue sequences are now added into recoveryQueue, small change to how lost packets are calculated, replaced switch cases to create packet with match --- src/API/BlockAPI.php | 2 - src/Player.php | 12 +- src/PocketMinecraftServer.php | 4 +- src/entity/Entity.php | 1 - src/network/protocol/packet/UnknownPacket.php | 4 + src/network/raknet/RakNetParser.php | 230 +++++------------- 6 files changed, 73 insertions(+), 180 deletions(-) diff --git a/src/API/BlockAPI.php b/src/API/BlockAPI.php index 97551224..ddd309d9 100755 --- a/src/API/BlockAPI.php +++ b/src/API/BlockAPI.php @@ -505,8 +505,6 @@ class BlockAPI{ if($hand->isSolid === true && ($hand->getID() != BED_BLOCK && $hand->getID() != CARPET)){ $aabb = $hand->getAABB($block->level, $block->x, $block->y, $block->z); $playerbb = $player->entity->boundingBox; - //$aabb->intersectsWith($playerbb) is not good enough for this case - //minY+0.21 is used to stop sneaking from triggering action cancelling if(($aabb->maxX > $playerbb->minX && $aabb->minX < $playerbb->maxX) && ($aabb->maxY > ($playerbb->minY+0.21) && $aabb->minY < $playerbb->maxY) && ($aabb->maxZ > $playerbb->minZ && $aabb->minZ < $playerbb->maxZ)){ return $this->cancelAction($block, $player, false); //Entity in block } diff --git a/src/Player.php b/src/Player.php index 87120d29..96a6bd0d 100755 --- a/src/Player.php +++ b/src/Player.php @@ -95,7 +95,7 @@ class Player{ */ public function __construct($clientID, $ip, $port, $MTU){ $this->bigCnt = 0; - $this->MTU = min($MTU, 1100); + $this->MTU = min($MTU, 1492); $this->server = ServerAPI::request(); $this->lastBreak = microtime(true); $this->clientID = $clientID; @@ -353,14 +353,14 @@ class Player{ if(EventHandler::callEvent(new DataPacketSendEvent($this, $packet)) === BaseEvent::DENY){ return; } - + $packet->encode(); $len = strlen($packet->buffer) + 1; $MTU = $this->MTU - 24; if($len > $MTU){ return $this->directBigRawPacket($packet); } - + if(($this->bufferLen + $len) >= $MTU){ $this->sendBuffer(); } @@ -1265,6 +1265,8 @@ class Player{ public function sendBlockUpdateQueue(){ if($this->blockUpdateQueueLength > 0 && $this->blockUpdateQueue instanceof RakNetPacket){ $this->blockUpdateQueue->seqNumber = $this->counter[0]++; + $this->recoveryQueue[$this->blockUpdateQueue->seqNumber] = $this->blockUpdateQueue; + $this->blockUpdateQueue->sendtime = microtime(true); $this->send($this->blockUpdateQueue); } $this->blockUpdateQueueLength = 0; @@ -2793,13 +2795,13 @@ 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; unset($this->recoveryQueue[$count]); + }else{ + ++$this->packetStats[1]; //lost and wont be recovered } - ++$this->packetStats[1]; } break; diff --git a/src/PocketMinecraftServer.php b/src/PocketMinecraftServer.php index cd260f11..1b281cfc 100644 --- a/src/PocketMinecraftServer.php +++ b/src/PocketMinecraftServer.php @@ -589,10 +589,10 @@ class PocketMinecraftServer{ break; } - $this->clients[$CID] = new Player($packet->clientID, $packet->ip, $packet->port, $packet->mtuSize); //New Session! + $this->clients[$CID] = $c = new Player($packet->clientID, $packet->ip, $packet->port, $packet->mtuSize); //New Session! $pk = new RakNetPacket(RakNetInfo::OPEN_CONNECTION_REPLY_2); $pk->serverID = $this->serverID; - $pk->mtuSize = $packet->mtuSize; + $pk->mtuSize = $c->MTU; $pk->ip = $packet->ip; $pk->port = $packet->port; $this->send($pk); diff --git a/src/entity/Entity.php b/src/entity/Entity.php index c9b794be..e4f5383c 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -1421,7 +1421,6 @@ class Entity extends Position $this->player->directDataPacket($pk, 0); } $this->knockbackTime = 10; - } return $ret; diff --git a/src/network/protocol/packet/UnknownPacket.php b/src/network/protocol/packet/UnknownPacket.php index d183dce1..08b89139 100644 --- a/src/network/protocol/packet/UnknownPacket.php +++ b/src/network/protocol/packet/UnknownPacket.php @@ -3,6 +3,10 @@ class UnknownPacket extends RakNetDataPacket{ public $packetID = -1; + public function __construct($pid = -1){ + $this->packetID = $pid; + } + public function pid(){ return $this->packetID; } diff --git a/src/network/raknet/RakNetParser.php b/src/network/raknet/RakNetParser.php index 0d6b8b29..1b346cf3 100644 --- a/src/network/raknet/RakNetParser.php +++ b/src/network/raknet/RakNetParser.php @@ -163,176 +163,66 @@ class RakNetParser{ if(strlen($buffer) < ($length - 1)){ return false; } - switch($pid){ - case ProtocolInfo::PING_PACKET: - $data = new PingPacket; - break; - case ProtocolInfo::PONG_PACKET: - $data = new PongPacket; - break; - case ProtocolInfo::CLIENT_CONNECT_PACKET: - $data = new ClientConnectPacket; - break; - case ProtocolInfo::SERVER_HANDSHAKE_PACKET: - $data = new ServerHandshakePacket; - break; - case ProtocolInfo::DISCONNECT_PACKET: - $data = new DisconnectPacket; - break; - case ProtocolInfo::LOGIN_PACKET: - $data = new LoginPacket; - break; - case ProtocolInfo::LOGIN_STATUS_PACKET: - $data = new LoginStatusPacket; - break; - case ProtocolInfo::READY_PACKET: - $data = new ReadyPacket; - break; - case ProtocolInfo::MESSAGE_PACKET: - $data = new MessagePacket; - break; - case ProtocolInfo::SET_TIME_PACKET: - $data = new SetTimePacket; - break; - case ProtocolInfo::START_GAME_PACKET: - $data = new StartGamePacket; - break; - case ProtocolInfo::ADD_MOB_PACKET: - $data = new AddMobPacket; - break; - case ProtocolInfo::ADD_PLAYER_PACKET: - $data = new AddPlayerPacket; - break; - case ProtocolInfo::REMOVE_PLAYER_PACKET: - $data = new RemovePlayerPacket; - break; - case ProtocolInfo::ADD_ENTITY_PACKET: - $data = new AddEntityPacket; - break; - case ProtocolInfo::REMOVE_ENTITY_PACKET: - $data = new RemoveEntityPacket; - break; - case ProtocolInfo::ADD_ITEM_ENTITY_PACKET: - $data = new AddItemEntityPacket; - break; - case ProtocolInfo::TAKE_ITEM_ENTITY_PACKET: - $data = new TakeItemEntityPacket; - break; - case ProtocolInfo::MOVE_ENTITY_PACKET: - $data = new MoveEntityPacket; - break; - case ProtocolInfo::MOVE_ENTITY_PACKET_POSROT: - $data = new MoveEntityPacket_PosRot; - break; - case ProtocolInfo::ROTATE_HEAD_PACKET: - $data = new RotateHeadPacket; - break; - case ProtocolInfo::MOVE_PLAYER_PACKET: - $data = new MovePlayerPacket; - break; - case ProtocolInfo::REMOVE_BLOCK_PACKET: - $data = new RemoveBlockPacket; - break; - case ProtocolInfo::UPDATE_BLOCK_PACKET: - $data = new UpdateBlockPacket; - break; - case ProtocolInfo::ADD_PAINTING_PACKET: - $data = new AddPaintingPacket; - break; - case ProtocolInfo::EXPLODE_PACKET: - $data = new ExplodePacket; - break; - case ProtocolInfo::LEVEL_EVENT_PACKET: - $data = new LevelEventPacket; - break; - case ProtocolInfo::TILE_EVENT_PACKET: - $data = new TileEventPacket; - break; - case ProtocolInfo::ENTITY_EVENT_PACKET: - $data = new EntityEventPacket; - break; - case ProtocolInfo::REQUEST_CHUNK_PACKET: - $data = new RequestChunkPacket; - break; - case ProtocolInfo::CHUNK_DATA_PACKET: - $data = new ChunkDataPacket; - break; - case ProtocolInfo::PLAYER_EQUIPMENT_PACKET: - $data = new PlayerEquipmentPacket; - break; - case ProtocolInfo::PLAYER_ARMOR_EQUIPMENT_PACKET: - $data = new PlayerArmorEquipmentPacket; - break; - case ProtocolInfo::INTERACT_PACKET: - $data = new InteractPacket; - break; - case ProtocolInfo::USE_ITEM_PACKET: - $data = new UseItemPacket; - break; - case ProtocolInfo::PLAYER_ACTION_PACKET: - $data = new PlayerActionPacket; - break; - case ProtocolInfo::HURT_ARMOR_PACKET: - $data = new HurtArmorPacket; - break; - case ProtocolInfo::SET_ENTITY_DATA_PACKET: - $data = new SetEntityDataPacket; - break; - case ProtocolInfo::SET_ENTITY_MOTION_PACKET: - $data = new SetEntityMotionPacket; - break; - case ProtocolInfo::SET_HEALTH_PACKET: - $data = new SetHealthPacket; - break; - case ProtocolInfo::SET_SPAWN_POSITION_PACKET: - $data = new SetSpawnPositionPacket; - break; - case ProtocolInfo::ANIMATE_PACKET: - $data = new AnimatePacket; - break; - case ProtocolInfo::RESPAWN_PACKET: - $data = new RespawnPacket; - break; - case ProtocolInfo::SEND_INVENTORY_PACKET: - $data = new SendInventoryPacket; - break; - case ProtocolInfo::DROP_ITEM_PACKET: - $data = new DropItemPacket; - break; - case ProtocolInfo::CONTAINER_OPEN_PACKET: - $data = new ContainerOpenPacket; - break; - case ProtocolInfo::CONTAINER_CLOSE_PACKET: - $data = new ContainerClosePacket; - break; - case ProtocolInfo::CONTAINER_SET_SLOT_PACKET: - $data = new ContainerSetSlotPacket; - break; - case ProtocolInfo::CONTAINER_SET_DATA_PACKET: - $data = new ContainerSetDataPacket; - break; - case ProtocolInfo::CONTAINER_SET_CONTENT_PACKET: - $data = new ContainerSetContentPacket; - break; - case ProtocolInfo::CHAT_PACKET: - $data = new ChatPacket; - break; - case ProtocolInfo::ADVENTURE_SETTINGS_PACKET: - $data = new AdventureSettingsPacket; - break; - case ProtocolInfo::ENTITY_DATA_PACKET: - $data = new EntityDataPacket; - break; - case ProtocolInfo::SET_ENTITY_LINK_PACKET: - $data = new SetEntityLinkPacket; - case ProtocolInfo::PLAYER_INPUT_PACKET: - $data = new PlayerInputPacket; - break; - default: - $data = new UnknownPacket(); - $data->packetID = $pid; - break; - } + + $data = match($pid){ + ProtocolInfo::PING_PACKET => new PingPacket(), + ProtocolInfo::PONG_PACKET => new PongPacket(), + ProtocolInfo::CLIENT_CONNECT_PACKET => new ClientConnectPacket(), + ProtocolInfo::SERVER_HANDSHAKE_PACKET => new ServerHandshakePacket(), + ProtocolInfo::DISCONNECT_PACKET => new DisconnectPacket(), + ProtocolInfo::LOGIN_PACKET => new LoginPacket(), + ProtocolInfo::LOGIN_STATUS_PACKET => new LoginStatusPacket(), + ProtocolInfo::READY_PACKET => new ReadyPacket(), + ProtocolInfo::MESSAGE_PACKET => new MessagePacket(), + ProtocolInfo::SET_TIME_PACKET => new SetTimePacket(), + ProtocolInfo::START_GAME_PACKET => new StartGamePacket(), + ProtocolInfo::ADD_MOB_PACKET => new AddMobPacket(), + ProtocolInfo::ADD_PLAYER_PACKET => new AddPlayerPacket(), + ProtocolInfo::REMOVE_PLAYER_PACKET => new RemovePlayerPacket(), + ProtocolInfo::ADD_ENTITY_PACKET => new AddEntityPacket(), + ProtocolInfo::REMOVE_ENTITY_PACKET => new RemoveEntityPacket(), + ProtocolInfo::ADD_ITEM_ENTITY_PACKET => new AddItemEntityPacket(), + ProtocolInfo::TAKE_ITEM_ENTITY_PACKET => new TakeItemEntityPacket(), + ProtocolInfo::MOVE_ENTITY_PACKET => new MoveEntityPacket(), + ProtocolInfo::MOVE_ENTITY_PACKET_POSROT => new MoveEntityPacket_PosRot(), + ProtocolInfo::ROTATE_HEAD_PACKET => new RotateHeadPacket(), + ProtocolInfo::MOVE_PLAYER_PACKET => new MovePlayerPacket(), + ProtocolInfo::REMOVE_BLOCK_PACKET => new RemoveBlockPacket(), + ProtocolInfo::UPDATE_BLOCK_PACKET => new UpdateBlockPacket(), + ProtocolInfo::ADD_PAINTING_PACKET => new AddPaintingPacket(), + ProtocolInfo::EXPLODE_PACKET => new ExplodePacket(), + ProtocolInfo::LEVEL_EVENT_PACKET => new LevelEventPacket(), + ProtocolInfo::TILE_EVENT_PACKET => new TileEventPacket(), + ProtocolInfo::ENTITY_EVENT_PACKET => new EntityEventPacket(), + ProtocolInfo::REQUEST_CHUNK_PACKET => new RequestChunkPacket(), + ProtocolInfo::CHUNK_DATA_PACKET => new ChunkDataPacket(), + ProtocolInfo::PLAYER_EQUIPMENT_PACKET => new PlayerEquipmentPacket(), + ProtocolInfo::PLAYER_ARMOR_EQUIPMENT_PACKET => new PlayerArmorEquipmentPacket(), + ProtocolInfo::INTERACT_PACKET => new InteractPacket(), + ProtocolInfo::USE_ITEM_PACKET => new UseItemPacket(), + ProtocolInfo::PLAYER_ACTION_PACKET => new PlayerActionPacket(), + ProtocolInfo::HURT_ARMOR_PACKET => new HurtArmorPacket(), + ProtocolInfo::SET_ENTITY_DATA_PACKET => new SetEntityDataPacket(), + ProtocolInfo::SET_ENTITY_MOTION_PACKET => new SetEntityMotionPacket(), + ProtocolInfo::SET_HEALTH_PACKET => new SetHealthPacket(), + ProtocolInfo::SET_SPAWN_POSITION_PACKET => new SetSpawnPositionPacket(), + ProtocolInfo::ANIMATE_PACKET => new AnimatePacket(), + ProtocolInfo::RESPAWN_PACKET => new RespawnPacket(), + ProtocolInfo::SEND_INVENTORY_PACKET => new SendInventoryPacket(), + ProtocolInfo::DROP_ITEM_PACKET => new DropItemPacket(), + ProtocolInfo::CONTAINER_OPEN_PACKET => new ContainerOpenPacket(), + ProtocolInfo::CONTAINER_CLOSE_PACKET => new ContainerClosePacket(), + ProtocolInfo::CONTAINER_SET_SLOT_PACKET => new ContainerSetSlotPacket(), + ProtocolInfo::CONTAINER_SET_DATA_PACKET => new ContainerSetDataPacket(), + ProtocolInfo::CONTAINER_SET_CONTENT_PACKET => new ContainerSetContentPacket(), + ProtocolInfo::CHAT_PACKET => new ChatPacket(), + ProtocolInfo::ADVENTURE_SETTINGS_PACKET => new AdventureSettingsPacket(), + ProtocolInfo::ENTITY_DATA_PACKET => new EntityDataPacket(), + ProtocolInfo::SET_ENTITY_LINK_PACKET => new SetEntityLinkPacket(), + ProtocolInfo::PLAYER_INPUT_PACKET => new PlayerInputPacket(), + default => new UnknownPacket($pid) + }; + $data->reliability = $reliability; $data->hasSplit = $hasSplit; $data->messageIndex = $messageIndex;