mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 18:32:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'api3/network' into api3/network_mcpe-1.0.5

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-03-19 21:54:14 +00:00
parent ab1150382a 9c350dbe47
commit 36cda5de61
5 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/pocketmine/network/Network.php
View File

@ -237,10 +237,22 @@ class Network{
return $this->server;
}
/**
* Decodes a batch packet and does handling for it.
*
* TODO: Move this out of here
*
* @param BatchPacket $packet
* @param Player $player
*
* @throws \InvalidArgumentException|\InvalidStateException
*/
public function processBatch(BatchPacket $packet, Player $p){
if(strlen($packet->payload) === 0){
//prevent zlib_decode errors for incorrectly-decoded packets
$rawLen = strlen($packet->payload);
if($rawLen === 0){
throw new \InvalidArgumentException("BatchPacket payload is empty or packet decode error");
}elseif($rawLen < 3){
throw new \InvalidArgumentException("Not enough bytes, expected zlib header");
}
$str = zlib_decode($packet->payload, 1024 * 1024 * 64); //Max 64MB
@ -264,10 +276,7 @@ class Network{
$pk->decode();
assert($pk->feof(), "Still " . strlen(substr($pk->buffer, $pk->offset)) . " bytes unread in " . get_class($pk));
if(!$pk->handle($p)){
$logger = $this->server->getLogger();
$logger->debug("Unhandled " . get_class($pk) . " received from " . $p->getName());
}
$p->handleDataPacket($pk);
}
}
}