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

Fixed Query-related crash

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-11-01 16:20:40 +01:00
parent 90777014b6
commit bf596ebf05
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/pocketmine/Server.php
View File

@ -631,9 +631,16 @@ class Server{
* @param string $payload * @param string $payload
*/ */
public function handlePacket($address, $port, $payload){ public function handlePacket($address, $port, $payload){
try{
if(strlen($payload) > 2 and substr($payload, 0, 2) === "\xfe\xfd" and $this->queryHandler instanceof QueryHandler){ if(strlen($payload) > 2 and substr($payload, 0, 2) === "\xfe\xfd" and $this->queryHandler instanceof QueryHandler){
$this->queryHandler->handle($address, $port, $payload); $this->queryHandler->handle($address, $port, $payload);
} //TODO: add raw packet events }
}catch(\Exception $e){
if($this->logger instanceof MainLogger){
$this->logger->logException($e);
}
}
//TODO: add raw packet events
} }
/** /**
@ -2171,7 +2178,13 @@ class Server{
if(($this->tickCounter & 0b1111) === 0){ if(($this->tickCounter & 0b1111) === 0){
$this->titleTick(); $this->titleTick();
if(isset($this->queryHandler) and ($this->tickCounter & 0b111111111) === 0){ if(isset($this->queryHandler) and ($this->tickCounter & 0b111111111) === 0){
try{
$this->queryHandler->regenerateInfo(); $this->queryHandler->regenerateInfo();
}catch(\Exception $e){
if($this->logger instanceof MainLogger){
$this->logger->logException($e);
}
}
} }
} }