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

Fixed crash caused by a race condition on Query

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-08-15 16:07:04 +02:00
parent 7a5c583407
commit 2f9494ed52
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/network/query/QueryHandler.php
View File

@ -76,7 +76,7 @@ class QueryHandler{
"version" => $this->server->getVersion(), "version" => $this->server->getVersion(),
"server_engine" => $this->server->getName() . " " . $this->server->getPocketMineVersion(), "server_engine" => $this->server->getName() . " " . $this->server->getPocketMineVersion(),
"plugins" => $plist, "plugins" => $plist,
"map" => $this->server->getDefaultLevel()->getName(), "map" => $this->server->getDefaultLevel() === null ? "unknown" : $this->server->getDefaultLevel()->getName(),
"numplayers" => count($this->server->getOnlinePlayers()), "numplayers" => count($this->server->getOnlinePlayers()),
"maxplayers" => $this->server->getMaxPlayers(), "maxplayers" => $this->server->getMaxPlayers(),
"whitelist" => $this->server->hasWhitelist() === true ? "on" : "off", "whitelist" => $this->server->hasWhitelist() === true ? "on" : "off",
@ -133,7 +133,7 @@ class QueryHandler{
} }
$reply .= $this->longData; $reply .= $this->longData;
}else{ }else{
$reply .= $this->server->getServerName() . "\x00" . (($this->server->getGamemode() & 0x01) === 0 ? "SMP" : "CMP") . "\x00" . $this->server->getDefaultLevel()->getName() . "\x00" . count($this->server->getOnlinePlayers()) . "\x00" . $this->server->getMaxPlayers() . "\x00" . Binary::writeLShort($this->server->getPort()) . $this->server->getIp() . "\x00"; $reply .= $this->server->getServerName() . "\x00" . (($this->server->getGamemode() & 0x01) === 0 ? "SMP" : "CMP") . "\x00" . ($this->server->getDefaultLevel() === null ? "unknown" : $this->server->getDefaultLevel()->getName()) . "\x00" . count($this->server->getOnlinePlayers()) . "\x00" . $this->server->getMaxPlayers() . "\x00" . Binary::writeLShort($this->server->getPort()) . $this->server->getIp() . "\x00";
} }
$this->server->sendPacket($address, $port, $reply); $this->server->sendPacket($address, $port, $reply);
break; break;