From efac23d4aff89db33e45963da18635af53a285c1 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 27 Jan 2018 19:10:55 +0000 Subject: [PATCH] Updated to new RakLib version --- composer.json | 2 +- composer.lock | 10 +++++----- src/pocketmine/network/mcpe/RakLibInterface.php | 5 ++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 601086b94..fb37057f1 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "ext-yaml": ">=2.0.0", "ext-zip": "*", "ext-zlib": ">=1.2.11", - "pocketmine/raklib": "dev-master#c29bebd2df63680e975d5d129aa25476f3ef86ba", + "pocketmine/raklib": "dev-master#eaa85c2b23bbc1a85030a621d4644c0e33e05950", "pocketmine/pocketmine-spl": "^0.2.0", "pocketmine/pocketmine-binaryutils": "dev-master#a7cd5303a3b215d26bf9be76682ce9311f40e887", "pocketmine/pocketmine-nbt": "dev-master#f8934c0aed90d1f55452588f7ebef7c4519518a5" diff --git a/composer.lock b/composer.lock index 5e79ffd6c..358c977e6 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "539efc3616f87bdf637798e9ea4b6125", + "content-hash": "5997f272811ed1148e7699a33335a0d2", "packages": [ { "name": "pocketmine/pocketmine-binaryutils", @@ -111,12 +111,12 @@ "source": { "type": "git", "url": "https://github.com/pmmp/RakLib.git", - "reference": "c29bebd2df63680e975d5d129aa25476f3ef86ba" + "reference": "eaa85c2b23bbc1a85030a621d4644c0e33e05950" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/RakLib/zipball/c29bebd2df63680e975d5d129aa25476f3ef86ba", - "reference": "c29bebd2df63680e975d5d129aa25476f3ef86ba", + "url": "https://api.github.com/repos/pmmp/RakLib/zipball/eaa85c2b23bbc1a85030a621d4644c0e33e05950", + "reference": "eaa85c2b23bbc1a85030a621d4644c0e33e05950", "shasum": "" }, "require": { @@ -141,7 +141,7 @@ "source": "https://github.com/pmmp/RakLib/tree/master", "issues": "https://github.com/pmmp/RakLib/issues" }, - "time": "2018-01-18T18:09:59+00:00" + "time": "2018-01-27T15:38:43+00:00" } ], "packages-dev": [], diff --git a/src/pocketmine/network/mcpe/RakLibInterface.php b/src/pocketmine/network/mcpe/RakLibInterface.php index 64c2f4228..3806580f3 100644 --- a/src/pocketmine/network/mcpe/RakLibInterface.php +++ b/src/pocketmine/network/mcpe/RakLibInterface.php @@ -38,6 +38,7 @@ use raklib\RakLib; use raklib\server\RakLibServer; use raklib\server\ServerHandler; use raklib\server\ServerInstance; +use raklib\utils\InternetAddress; class RakLibInterface implements ServerInstance, AdvancedSourceInterface{ @@ -68,9 +69,7 @@ class RakLibInterface implements ServerInstance, AdvancedSourceInterface{ $this->rakLib = new RakLibServer( $this->server->getLogger(), \pocketmine\COMPOSER_AUTOLOADER_PATH, - $this->server->getPort(), - $this->server->getIp() === "" ? "0.0.0.0" : $this->server->getIp(), - false, + new InternetAddress($this->server->getIp() === "" ? "0.0.0.0" : $this->server->getIp(), $this->server->getPort(), 4), (int) $this->server->getProperty("network.max-mtu-size", 1492) ); $this->interface = new ServerHandler($this->rakLib, $this);