mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 17:59:48 +00:00
Code Issues Projects Releases Wiki Activity

Network: Added RawPacketHandler interface, query handler is now a component

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-03-24 18:02:19 +00:00
parent a753c1342d
commit 6990d6239e
5 changed files with 108 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/pocketmine/Server.php
View File

@ -62,7 +62,6 @@ use pocketmine\nbt\BigEndianNbtSerializer;
use pocketmine\nbt\NbtDataException;
use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\TreeRoot;
use pocketmine\network\AdvancedNetworkInterface;
use pocketmine\network\mcpe\CompressBatchPromise;
use pocketmine\network\mcpe\CompressBatchTask;
use pocketmine\network\mcpe\NetworkCipher;
@ -106,7 +105,6 @@ use function array_key_exists;
use function array_shift;
use function array_sum;
use function base64_encode;
use function bin2hex;
use function copy;
use function count;
use function define;
@ -280,9 +278,6 @@ class Server{
/** @var string[] */
private $uniquePlayers = [];
/** @var QueryHandler */
private $queryHandler;
/** @var QueryRegenerateEvent */
private $queryRegenerateTask = null;
@ -1201,7 +1196,7 @@ class Server{
$this->getLogger()->debug("Server unique id: " . $this->getServerUniqueId());
$this->getLogger()->debug("Machine unique id: " . Utils::getMachineUniqueId());
$this->network = new Network();
$this->network = new Network($this->logger);
$this->network->setName($this->getMotd());
@ -1327,7 +1322,7 @@ class Server{
$this->enablePlugins(PluginLoadOrder::POSTWORLD);
if($this->getConfigBool("enable-query", true)){
$this->queryHandler = new QueryHandler();
$this->network->registerRawPacketHandler(new QueryHandler());
}
foreach($this->getIPBans()->getEntries() as $entry){
@ -1953,22 +1948,6 @@ class Server{
Timings::$titleTickTimer->stopTiming();
}
/**
* @param AdvancedNetworkInterface $interface
* @param string $address
* @param int $port
* @param string $payload
*
* TODO: move this to Network
*/
public function handlePacket(AdvancedNetworkInterface $interface, string $address, int $port, string $payload) : void{
if($this->queryHandler === null or !$this->queryHandler->handle($interface, $address, $port, $payload)){
$this->logger->debug("Unhandled raw packet from $address $port: " . bin2hex($payload));
}
//TODO: add raw packet events
}
/**
* Tries to execute a server tick
*/