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

Added packet exception handling, updated RakLib

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-10-31 19:14:59 +01:00
parent 01ffb14e39
commit ae06681b60
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/pocketmine/network/RakLibInterface.php
View File

@ -74,6 +74,7 @@ use pocketmine\network\protocol\UpdateBlockPacket;
use pocketmine\network\protocol\UseItemPacket; use pocketmine\network\protocol\UseItemPacket;
use pocketmine\Player; use pocketmine\Player;
use pocketmine\Server; use pocketmine\Server;
use pocketmine\utils\MainLogger;
use pocketmine\utils\TextFormat; use pocketmine\utils\TextFormat;
use raklib\protocol\EncapsulatedPacket; use raklib\protocol\EncapsulatedPacket;
use raklib\RakLib; use raklib\RakLib;
@ -175,9 +176,19 @@ class RakLibInterface implements ServerInstance, SourceInterface{
public function handleEncapsulated($identifier, EncapsulatedPacket $packet, $flags){ public function handleEncapsulated($identifier, EncapsulatedPacket $packet, $flags){
if(isset($this->players[$identifier])){ if(isset($this->players[$identifier])){
$pk = $this->getPacket($packet->buffer); try{
$pk->decode(); $pk = $this->getPacket($packet->buffer);
$this->players[$identifier]->handleDataPacket($pk); $pk->decode();
$this->players[$identifier]->handleDataPacket($pk);
}catch (\Exception $e){
if(\pocketmine\DEBUG > 1){
$logger = $this->server->getLogger();
if($logger instanceof MainLogger){
$logger->logException($e);
$logger->debug("Packet ".get_class($pk)." 0x".bin2hex($packet->buffer));
}
}
}
} }
} }

2
src/raklib

@ -1 +1 @@
Subproject commit 9a041749f3b8bba460ae413e7fa89f488dd7b652 Subproject commit cb3c3efd9cc8b04b686788a3a3450731f9ff97e4