From 99134de6b656a7482a0c9ef12f0ec29460e3410e Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Wed, 4 Apr 2018 10:29:32 +0100
Subject: [PATCH] Updated NBT dependency 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.

---
 composer.json                                   |  2 +-
 composer.lock                                   | 10 +++++-----
 src/pocketmine/command/defaults/GiveCommand.php |  4 ++--
 src/pocketmine/lang/locale                      |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index a8d8e5b43..249d2b47a 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
       "pocketmine/raklib": "dev-master#31d6522de71a9c404aff5c23c49c6ea0526793fb",
       "pocketmine/spl": "dev-master#ee32424c100fd11ae7f7b8df7604623fd475f0ec",
       "pocketmine/binaryutils": "dev-master#03e6851f814aba96487ec64181a6ae948edd9f7a",
-      "pocketmine/nbt": "dev-master#e8fb4c11b291e96c2b44220a5d00f97c1692556e",
+      "pocketmine/nbt": "dev-master#4c06591a6beda8050e144eb82ed10d01c88654a8",
       "pocketmine/math": "dev-master#1df74f0352309a9c1e6728fa416a3f0493d07b16"
    },
    "autoload": {
diff --git a/composer.lock b/composer.lock
index 3b00bcd70..020ebc776 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": "5db3835d3aa7483520dc89b1778bd765",
+    "content-hash": "4bacfe4e1183113688c2bccd624b15d0",
     "packages": [
         {
             "name": "pocketmine/binaryutils",
@@ -78,12 +78,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/NBT.git",
-                "reference": "e8fb4c11b291e96c2b44220a5d00f97c1692556e"
+                "reference": "4c06591a6beda8050e144eb82ed10d01c88654a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/NBT/zipball/e8fb4c11b291e96c2b44220a5d00f97c1692556e",
-                "reference": "e8fb4c11b291e96c2b44220a5d00f97c1692556e",
+                "url": "https://api.github.com/repos/pmmp/NBT/zipball/4c06591a6beda8050e144eb82ed10d01c88654a8",
+                "reference": "4c06591a6beda8050e144eb82ed10d01c88654a8",
                 "shasum": ""
             },
             "require": {
@@ -109,7 +109,7 @@
                 "source": "https://github.com/pmmp/NBT/tree/master",
                 "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",
diff --git a/src/pocketmine/command/defaults/GiveCommand.php b/src/pocketmine/command/defaults/GiveCommand.php
index 49a2a59ab..36d510f11 100644
--- a/src/pocketmine/command/defaults/GiveCommand.php
+++ b/src/pocketmine/command/defaults/GiveCommand.php
@@ -28,7 +28,7 @@ use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
 use pocketmine\item\ItemFactory;
 use pocketmine\lang\TranslationContainer;
-use pocketmine\nbt\JsonNBTParser;
+use pocketmine\nbt\JsonNbtParser;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\utils\TextFormat;
 
@@ -75,7 +75,7 @@ class GiveCommand extends VanillaCommand{
 			$tags = $exception = null;
 			$data = implode(" ", array_slice($args, 3));
 			try{
-				$tags = JsonNBTParser::parseJSON($data);
+				$tags = JsonNbtParser::parseJson($data);
 			}catch(\Exception $ex){
 				$exception = $ex;
 			}
diff --git a/src/pocketmine/lang/locale b/src/pocketmine/lang/locale
index 22697bf0b..0770ef2ec 160000
--- a/src/pocketmine/lang/locale
+++ b/src/pocketmine/lang/locale
@@ -1 +1 @@
-Subproject commit 22697bf0bcde0a9906f765b2a41522db844367ef
+Subproject commit 0770ef2ecf279178aca15cf1b65b544918e439e1