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

Updated RakLib dependency

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-03-17 11:27:56 +00:00
parent eeeef8df51
commit d12b1d3e07
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -21,7 +21,7 @@
"ext-yaml": ">=2.0.0", "ext-yaml": ">=2.0.0",
"ext-zip": "*", "ext-zip": "*",
"ext-zlib": ">=1.2.11", "ext-zlib": ">=1.2.11",
"pocketmine/raklib": "dev-master#87d7e7fba9d8b2231d95d8f55e19c060ebbcb35c", "pocketmine/raklib": "dev-master#fc2a4856e52e854336b7d0a343456c68729c64b3",
"pocketmine/pocketmine-spl": "^0.2.0", "pocketmine/pocketmine-spl": "^0.2.0",
"pocketmine/pocketmine-binaryutils": "dev-master#a7cd5303a3b215d26bf9be76682ce9311f40e887", "pocketmine/pocketmine-binaryutils": "dev-master#a7cd5303a3b215d26bf9be76682ce9311f40e887",
"pocketmine/pocketmine-nbt": "dev-master#33aaaebab10b501d233b6208d6a170b82f40c3b4" "pocketmine/pocketmine-nbt": "dev-master#33aaaebab10b501d233b6208d6a170b82f40c3b4"

10
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "5cf5b17b7ad474212f61300e4fbbd012", "content-hash": "6bb86f5ed12d2974130c4af6f4560574",
"packages": [ "packages": [
{ {
"name": "pocketmine/pocketmine-binaryutils", "name": "pocketmine/pocketmine-binaryutils",
@ -116,12 +116,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/pmmp/RakLib.git", "url": "https://github.com/pmmp/RakLib.git",
"reference": "87d7e7fba9d8b2231d95d8f55e19c060ebbcb35c" "reference": "fc2a4856e52e854336b7d0a343456c68729c64b3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/pmmp/RakLib/zipball/87d7e7fba9d8b2231d95d8f55e19c060ebbcb35c", "url": "https://api.github.com/repos/pmmp/RakLib/zipball/fc2a4856e52e854336b7d0a343456c68729c64b3",
"reference": "87d7e7fba9d8b2231d95d8f55e19c060ebbcb35c", "reference": "fc2a4856e52e854336b7d0a343456c68729c64b3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -146,7 +146,7 @@
"source": "https://github.com/pmmp/RakLib/tree/master", "source": "https://github.com/pmmp/RakLib/tree/master",
"issues": "https://github.com/pmmp/RakLib/issues" "issues": "https://github.com/pmmp/RakLib/issues"
}, },
"time": "2018-02-18T20:15:02+00:00" "time": "2018-03-17T11:25:07+00:00"
} }
], ],
"packages-dev": [], "packages-dev": [],

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

@ -41,6 +41,11 @@ use raklib\server\ServerInstance;
use raklib\utils\InternetAddress; use raklib\utils\InternetAddress;
class RakLibInterface implements ServerInstance, AdvancedSourceInterface{ class RakLibInterface implements ServerInstance, AdvancedSourceInterface{
/**
* Sometimes this gets changed when the MCPE-layer protocol gets broken to the point where old and new can't
* communicate. It's important that we check this to avoid catastrophes.
*/
private const MCPE_RAKNET_PROTOCOL_VERSION = 8;
/** @var Server */ /** @var Server */
private $server; private $server;
@ -70,7 +75,8 @@ class RakLibInterface implements ServerInstance, AdvancedSourceInterface{
$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() === "" ? "0.0.0.0" : $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
); );
$this->interface = new ServerHandler($this->rakLib, $this); $this->interface = new ServerHandler($this->rakLib, $this);
} }