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

Server::getIp() now returns 0.0.0.0 if the IP string is empty

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-05-10 10:25:44 +01:00
parent e7c5d14af3
commit 5e91c05424
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pocketmine/Server.php
View File

@ -390,7 +390,8 @@ class Server{
* @return string * @return string
*/ */
public function getIp() : string{ public function getIp() : string{
return $this->getConfigString("server-ip", "0.0.0.0"); $str = $this->getConfigString("server-ip");
return $str !== "" ? $str : "0.0.0.0";
} }
/** /**
@ -1537,7 +1538,7 @@ class Server{
$this, $this,
$this->getConfigString("rcon.password", ""), $this->getConfigString("rcon.password", ""),
$this->getConfigInt("rcon.port", $this->getPort()), $this->getConfigInt("rcon.port", $this->getPort()),
($ip = $this->getIp()) != "" ? $ip : "0.0.0.0", $this->getIp(),
$this->getConfigInt("rcon.threads", 1), $this->getConfigInt("rcon.threads", 1),
$this->getConfigInt("rcon.clients-per-thread", 50) $this->getConfigInt("rcon.clients-per-thread", 50)
); );
@ -1583,7 +1584,7 @@ class Server{
@cli_set_process_title($this->getName() . " " . $this->getPocketMineVersion()); @cli_set_process_title($this->getName() . " " . $this->getPocketMineVersion());
} }
$this->logger->info($this->getLanguage()->translateString("pocketmine.server.networkStart", [$this->getIp() === "" ? "*" : $this->getIp(), $this->getPort()])); $this->logger->info($this->getLanguage()->translateString("pocketmine.server.networkStart", [$this->getIp(), $this->getPort()]));
define("BOOTUP_RANDOM", random_bytes(16)); define("BOOTUP_RANDOM", random_bytes(16));
$this->serverID = Utils::getMachineUniqueId($this->getIp() . $this->getPort()); $this->serverID = Utils::getMachineUniqueId($this->getIp() . $this->getPort());

2
src/pocketmine/network/mcpe/RakLibInterface.php
View File

@ -83,7 +83,7 @@ class RakLibInterface implements ServerInstance, AdvancedSourceInterface{
$this->rakLib = new RakLibServer( $this->rakLib = new RakLibServer(
$this->server->getLogger(), $this->server->getLogger(),
\pocketmine\COMPOSER_AUTOLOADER_PATH, \pocketmine\COMPOSER_AUTOLOADER_PATH,
new InternetAddress($this->server->getIp() === "" ? "0.0.0.0" : $this->server->getIp(), $this->server->getPort(), 4), new InternetAddress($this->server->getIp(), $this->server->getPort(), 4),
(int) $this->server->getProperty("network.max-mtu-size", 1492), (int) $this->server->getProperty("network.max-mtu-size", 1492),
self::MCPE_RAKNET_PROTOCOL_VERSION, self::MCPE_RAKNET_PROTOCOL_VERSION,
$this->sleeper $this->sleeper

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

@ -40,7 +40,7 @@ class QueryHandler{
public function __construct(){ public function __construct(){
$this->server = Server::getInstance(); $this->server = Server::getInstance();
$this->server->getLogger()->info($this->server->getLanguage()->translateString("pocketmine.server.query.start")); $this->server->getLogger()->info($this->server->getLanguage()->translateString("pocketmine.server.query.start"));
$addr = ($ip = $this->server->getIp()) != "" ? $ip : "0.0.0.0"; $addr = $this->server->getIp();
$port = $this->server->getPort(); $port = $this->server->getPort();
$this->server->getLogger()->info($this->server->getLanguage()->translateString("pocketmine.server.query.info", [$port])); $this->server->getLogger()->info($this->server->getLanguage()->translateString("pocketmine.server.query.info", [$port]));
/* /*