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

Fixed DataPacketReceiveEvent, fixed packet receive timings, gave Player->handleDataPacket() a new use

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-03-19 21:50:09 +00:00
parent be449b6106
commit 9c350dbe47
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pocketmine/Player.php
View File

@ -3291,7 +3291,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
} }
/** /**
* TODO: get rid of these remains, fix DataPacketReceiveEvent, fix timings * Called when a packet is received from the client. This method will call DataPacketReceiveEvent.
* *
* @param DataPacket $packet * @param DataPacket $packet
*/ */
@ -3300,18 +3300,14 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
return; return;
} }
$timings = Timings::getReceiveDataPacketTimings($packet); $timings = Timings::getReceiveDataPacketTimings($packet);
$timings->startTiming(); $timings->startTiming();
$this->server->getPluginManager()->callEvent($ev = new DataPacketReceiveEvent($this, $packet)); $this->server->getPluginManager()->callEvent($ev = new DataPacketReceiveEvent($this, $packet));
if($ev->isCancelled()){ if(!$ev->isCancelled() and !$packet->handle($this)){
$timings->stopTiming(); $this->server->getLogger()->debug("Unhandled " . get_class($packet) . " received from " . $this->getName());
return;
} }
$timings->stopTiming(); $timings->stopTiming();
} }

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

@ -232,10 +232,22 @@ class Network{
return $this->server; 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){ public function processBatch(BatchPacket $packet, Player $p){
if(strlen($packet->payload) === 0){ $rawLen = strlen($packet->payload);
//prevent zlib_decode errors for incorrectly-decoded packets if($rawLen === 0){
throw new \InvalidArgumentException("BatchPacket payload is empty or packet decode error"); 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 $str = zlib_decode($packet->payload, 1024 * 1024 * 64); //Max 64MB
@ -259,10 +271,7 @@ class Network{
$pk->decode(); $pk->decode();
assert($pk->feof(), "Still " . strlen(substr($pk->buffer, $pk->offset)) . " bytes unread in " . get_class($pk)); assert($pk->feof(), "Still " . strlen(substr($pk->buffer, $pk->offset)) . " bytes unread in " . get_class($pk));
if(!$pk->handle($p)){ $p->handleDataPacket($pk);
$logger = $this->server->getLogger();
$logger->debug("Unhandled " . get_class($pk) . " received from " . $p->getName());
}
} }
} }
} }

5
src/pocketmine/network/mcpe/RakLibInterface.php
View File

@ -135,10 +135,7 @@ class RakLibInterface implements ServerInstance, AdvancedSourceInterface{
if($pk !== null){ if($pk !== null){
$pk->decode(); $pk->decode();
assert($pk->feof(), "Still " . strlen(substr($pk->buffer, $pk->offset)) . " bytes unread!"); assert($pk->feof(), "Still " . strlen(substr($pk->buffer, $pk->offset)) . " bytes unread!");
if(!$pk->handle($this->players[$identifier])){ $this->players[$identifier]->handleDataPacket($pk);
$logger = $this->server->getLogger();
$logger->debug("Unhandled " . get_class($pk) . " received from " . $this->players[$identifier]->getName());
}
} }
} }
}catch(\Throwable $e){ }catch(\Throwable $e){