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

Sync composer dependencies (master)

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-01-09 00:22:42 +00:00
commit b9ce6537a8
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -29,7 +29,7 @@
"mdanter/ecc": "^0.5.0", "mdanter/ecc": "^0.5.0",
"pocketmine/raklib": "dev-master", "pocketmine/raklib": "dev-master",
"pocketmine/spl": "dev-master", "pocketmine/spl": "dev-master",
"pocketmine/binaryutils": "^0.1.0", "pocketmine/binaryutils": "^0.1.7",
"pocketmine/nbt": "dev-master", "pocketmine/nbt": "dev-master",
"pocketmine/math": "dev-master", "pocketmine/math": "dev-master",
"pocketmine/snooze": "^0.1.0", "pocketmine/snooze": "^0.1.0",

24
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "a011d12545207848fb8fe0fccb1cf18c", "content-hash": "959fe32be1db4613fd22eb2c7c7b23c6",
"packages": [ "packages": [
{ {
"name": "adhocore/json-comment", "name": "adhocore/json-comment",
@ -295,16 +295,16 @@
}, },
{ {
"name": "pocketmine/binaryutils", "name": "pocketmine/binaryutils",
"version": "0.1.6", "version": "0.1.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/pmmp/BinaryUtils.git", "url": "https://github.com/pmmp/BinaryUtils.git",
"reference": "53cbb5a958130a6c6b5a4c511e623f4d401c1476" "reference": "3403751da9d39853b43426085cd242173baadd2b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/53cbb5a958130a6c6b5a4c511e623f4d401c1476", "url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/3403751da9d39853b43426085cd242173baadd2b",
"reference": "53cbb5a958130a6c6b5a4c511e623f4d401c1476", "reference": "3403751da9d39853b43426085cd242173baadd2b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -322,10 +322,10 @@
], ],
"description": "Classes and methods for conveniently handling binary data", "description": "Classes and methods for conveniently handling binary data",
"support": { "support": {
"source": "https://github.com/pmmp/BinaryUtils/tree/0.1.6", "source": "https://github.com/pmmp/BinaryUtils/tree/0.1.7",
"issues": "https://github.com/pmmp/BinaryUtils/issues" "issues": "https://github.com/pmmp/BinaryUtils/issues"
}, },
"time": "2019-01-06T15:20:40+00:00" "time": "2019-01-07T15:59:50+00:00"
}, },
{ {
"name": "pocketmine/math", "name": "pocketmine/math",
@ -372,19 +372,19 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/pmmp/NBT.git", "url": "https://github.com/pmmp/NBT.git",
"reference": "ead8577bf3ff0eb8dd3c19c40a67a9ee6d06783a" "reference": "8b211471159b4aca329c665bdbd9149046ca6550"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/pmmp/NBT/zipball/ead8577bf3ff0eb8dd3c19c40a67a9ee6d06783a", "url": "https://api.github.com/repos/pmmp/NBT/zipball/8b211471159b4aca329c665bdbd9149046ca6550",
"reference": "ead8577bf3ff0eb8dd3c19c40a67a9ee6d06783a", "reference": "8b211471159b4aca329c665bdbd9149046ca6550",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-zlib": "*", "ext-zlib": "*",
"php": ">=7.2.0", "php": ">=7.2.0",
"php-64bit": "*", "php-64bit": "*",
"pocketmine/binaryutils": "^0.1.0" "pocketmine/binaryutils": "^0.1.7"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@ -405,7 +405,7 @@
"source": "https://github.com/pmmp/NBT/tree/master", "source": "https://github.com/pmmp/NBT/tree/master",
"issues": "https://github.com/pmmp/NBT/issues" "issues": "https://github.com/pmmp/NBT/issues"
}, },
"time": "2019-01-07T21:01:32+00:00" "time": "2019-01-09T00:12:13+00:00"
}, },
{ {
"name": "pocketmine/raklib", "name": "pocketmine/raklib",

2
src/pocketmine/utils/Config.php
View File

@ -540,7 +540,7 @@ class Config{
* @param string $content * @param string $content
*/ */
private function parseProperties(string $content){ private function parseProperties(string $content){
if(preg_match_all('/([a-zA-Z0-9\-_\.]+)[ \t]*=([^\r\n]*)/u', $content, $matches) > 0){ //false or 0 matches if(preg_match_all('/^\s*([a-zA-Z0-9\-_\.]+)[ \t]*=([^\r\n]*)/um', $content, $matches) > 0){ //false or 0 matches
foreach($matches[1] as $i => $k){ foreach($matches[1] as $i => $k){
$v = trim($matches[2][$i]); $v = trim($matches[2][$i]);
switch(strtolower($v)){ switch(strtolower($v)){