use the appropriate API for decoding packet batches

This commit is contained in:
Dylan K. Taylor 2019-05-06 17:46:17 +01:00
parent 82974e0271
commit c2771eba88

View File

@ -51,7 +51,6 @@ use pocketmine\network\mcpe\protocol\ModalFormRequestPacket;
use pocketmine\network\mcpe\protocol\MovePlayerPacket; use pocketmine\network\mcpe\protocol\MovePlayerPacket;
use pocketmine\network\mcpe\protocol\NetworkChunkPublisherUpdatePacket; use pocketmine\network\mcpe\protocol\NetworkChunkPublisherUpdatePacket;
use pocketmine\network\mcpe\protocol\Packet; use pocketmine\network\mcpe\protocol\Packet;
use pocketmine\network\mcpe\protocol\PacketPool;
use pocketmine\network\mcpe\protocol\PlayStatusPacket; use pocketmine\network\mcpe\protocol\PlayStatusPacket;
use pocketmine\network\mcpe\protocol\ServerboundPacket; use pocketmine\network\mcpe\protocol\ServerboundPacket;
use pocketmine\network\mcpe\protocol\ServerToClientHandshakePacket; use pocketmine\network\mcpe\protocol\ServerToClientHandshakePacket;
@ -280,7 +279,7 @@ class NetworkSession{
throw new BadPacketException("Too many packets in a single batch"); throw new BadPacketException("Too many packets in a single batch");
} }
try{ try{
$pk = PacketPool::getPacket($stream->getString()); $pk = $stream->getPacket();
}catch(BinaryDataException $e){ }catch(BinaryDataException $e){
$this->logger->debug("Packet batch: " . bin2hex($stream->getBuffer())); $this->logger->debug("Packet batch: " . bin2hex($stream->getBuffer()));
throw new BadPacketException("Packet batch decode error: " . $e->getMessage(), 0, $e); throw new BadPacketException("Packet batch decode error: " . $e->getMessage(), 0, $e);