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

Updated NBT dependency

Browse Source 
this needs further changes (particularly to Furnace) to stop things abusing NBT for runtime data handling, otherwise performance is going to drop off a cliff.
This commit is contained in:
Dylan K. Taylor 2018-04-04 10:29:32 +01:00
parent 1fc388d6de
commit 99134de6b6
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -24,7 +24,7 @@
"pocketmine/raklib": "dev-master#31d6522de71a9c404aff5c23c49c6ea0526793fb", "pocketmine/raklib": "dev-master#31d6522de71a9c404aff5c23c49c6ea0526793fb",
"pocketmine/spl": "dev-master#ee32424c100fd11ae7f7b8df7604623fd475f0ec", "pocketmine/spl": "dev-master#ee32424c100fd11ae7f7b8df7604623fd475f0ec",
"pocketmine/binaryutils": "dev-master#03e6851f814aba96487ec64181a6ae948edd9f7a", "pocketmine/binaryutils": "dev-master#03e6851f814aba96487ec64181a6ae948edd9f7a",
"pocketmine/nbt": "dev-master#e8fb4c11b291e96c2b44220a5d00f97c1692556e", "pocketmine/nbt": "dev-master#4c06591a6beda8050e144eb82ed10d01c88654a8",
"pocketmine/math": "dev-master#1df74f0352309a9c1e6728fa416a3f0493d07b16" "pocketmine/math": "dev-master#1df74f0352309a9c1e6728fa416a3f0493d07b16"
}, },
"autoload": { "autoload": {

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": "5db3835d3aa7483520dc89b1778bd765", "content-hash": "4bacfe4e1183113688c2bccd624b15d0",
"packages": [ "packages": [
{ {
"name": "pocketmine/binaryutils", "name": "pocketmine/binaryutils",
@ -78,12 +78,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/pmmp/NBT.git", "url": "https://github.com/pmmp/NBT.git",
"reference": "e8fb4c11b291e96c2b44220a5d00f97c1692556e" "reference": "4c06591a6beda8050e144eb82ed10d01c88654a8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/pmmp/NBT/zipball/e8fb4c11b291e96c2b44220a5d00f97c1692556e", "url": "https://api.github.com/repos/pmmp/NBT/zipball/4c06591a6beda8050e144eb82ed10d01c88654a8",
"reference": "e8fb4c11b291e96c2b44220a5d00f97c1692556e", "reference": "4c06591a6beda8050e144eb82ed10d01c88654a8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -109,7 +109,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": "2018-03-17T12:16:12+00:00" "time": "2018-04-02T11:14:01+00:00"
}, },
{ {
"name": "pocketmine/raklib", "name": "pocketmine/raklib",

4
src/pocketmine/command/defaults/GiveCommand.php
View File

@ -28,7 +28,7 @@ use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\item\ItemFactory; use pocketmine\item\ItemFactory;
use pocketmine\lang\TranslationContainer; use pocketmine\lang\TranslationContainer;
use pocketmine\nbt\JsonNBTParser; use pocketmine\nbt\JsonNbtParser;
use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\CompoundTag;
use pocketmine\utils\TextFormat; use pocketmine\utils\TextFormat;
@ -75,7 +75,7 @@ class GiveCommand extends VanillaCommand{
$tags = $exception = null; $tags = $exception = null;
$data = implode(" ", array_slice($args, 3)); $data = implode(" ", array_slice($args, 3));
try{ try{
$tags = JsonNBTParser::parseJSON($data); $tags = JsonNbtParser::parseJson($data);
}catch(\Exception $ex){ }catch(\Exception $ex){
$exception = $ex; $exception = $ex;
} }

2
src/pocketmine/lang/locale

@ -1 +1 @@
Subproject commit 22697bf0bcde0a9906f765b2a41522db844367ef Subproject commit 0770ef2ecf279178aca15cf1b65b544918e439e1