mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-11 12:27:51 +00:00
Code Issues Projects Releases Wiki Activity

Handle unknown packets more gracefully

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-02-08 19:21:45 +01:00
parent 0ff647015c
commit dfd5733969
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/Player.php
View File

@ -1141,28 +1141,30 @@ class Player{
foreach($this->receiveQueue as $count => $packets){ foreach($this->receiveQueue as $count => $packets){
unset($this->receiveQueue[$count]); unset($this->receiveQueue[$count]);
foreach($packets as $p){ foreach($packets as $p){
if(isset($p->messageIndex) and $p->messageIndex !== false){ if($p instanceof RakNetDataPacket){
if($p->messageIndex > $this->receiveCount){ if(isset($p->messageIndex) and $p->messageIndex !== false){
$this->receiveCount = $p->messageIndex; if($p->messageIndex > $this->receiveCount){
}elseif($p->messageIndex !== 0){ $this->receiveCount = $p->messageIndex;
if(isset($this->received[$p->messageIndex])){ }elseif($p->messageIndex !== 0){
continue; if(isset($this->received[$p->messageIndex])){
}
switch($p->pid()){
case 0x01:
case ProtocolInfo::PING_PACKET:
case ProtocolInfo::PONG_PACKET:
case ProtocolInfo::MOVE_PLAYER_PACKET:
case ProtocolInfo::REQUEST_CHUNK_PACKET:
case ProtocolInfo::ANIMATE_PACKET:
case ProtocolInfo::SET_HEALTH_PACKET:
continue; continue;
}
switch($p->pid()){
case 0x01:
case ProtocolInfo::PING_PACKET:
case ProtocolInfo::PONG_PACKET:
case ProtocolInfo::MOVE_PLAYER_PACKET:
case ProtocolInfo::REQUEST_CHUNK_PACKET:
case ProtocolInfo::ANIMATE_PACKET:
case ProtocolInfo::SET_HEALTH_PACKET:
continue;
}
} }
$this->received[$p->messageIndex] = true;
} }
$this->received[$p->messageIndex] = true; $p->decode();
$this->handleDataPacket($p);
} }
$p->decode();
$this->handleDataPacket($p);
} }
} }
} }
@ -2235,7 +2237,7 @@ class Player{
} }
break; break;
default: default:
console("[DEBUG] Unhandled 0x".dechex($packet->pid())." data packet for ".$this->username." (".$this->clientID."): ".print_r($data, true), true, true, 2); console("[DEBUG] Unhandled 0x".dechex($packet->pid())." data packet for ".$this->username." (".$this->clientID."): ".print_r($packet, true), true, true, 2);
break; break;
} }
} }