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

More NBT updates

Browse Source 
This library is going to be completely different before I'm done here >.>
This commit is contained in:
Dylan K. Taylor 2018-02-15 12:11:36 +00:00
parent ce4e0bf69c
commit 42a7b7fa36
3 changed files with 7 additions and 7 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#9b50878021ca545684fc1fd2d9333911ab2988e1", "pocketmine/raklib": "dev-master#9b50878021ca545684fc1fd2d9333911ab2988e1",
"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#37ad66b279fa8e746ccc68a451eef8ef9421aaa5" "pocketmine/pocketmine-nbt": "dev-master#7186c4a47243f7eb374cbafc31cc797686b61db6"
}, },
"autoload": { "autoload": {
"psr-0": { "psr-0": {

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": "19400d9f6e78537580761ca473974158", "content-hash": "c7e83c674d1c7756afa995b7f595d790",
"packages": [ "packages": [
{ {
"name": "pocketmine/pocketmine-binaryutils", "name": "pocketmine/pocketmine-binaryutils",
@ -45,12 +45,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/pmmp/PocketMine-NBT.git", "url": "https://github.com/pmmp/PocketMine-NBT.git",
"reference": "37ad66b279fa8e746ccc68a451eef8ef9421aaa5" "reference": "7186c4a47243f7eb374cbafc31cc797686b61db6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/pmmp/PocketMine-NBT/zipball/37ad66b279fa8e746ccc68a451eef8ef9421aaa5", "url": "https://api.github.com/repos/pmmp/PocketMine-NBT/zipball/7186c4a47243f7eb374cbafc31cc797686b61db6",
"reference": "37ad66b279fa8e746ccc68a451eef8ef9421aaa5", "reference": "7186c4a47243f7eb374cbafc31cc797686b61db6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -76,7 +76,7 @@
"source": "https://github.com/pmmp/PocketMine-NBT/tree/master", "source": "https://github.com/pmmp/PocketMine-NBT/tree/master",
"issues": "https://github.com/pmmp/PocketMine-NBT/issues" "issues": "https://github.com/pmmp/PocketMine-NBT/issues"
}, },
"time": "2018-02-13T14:33:27+00:00" "time": "2018-02-14T17:39:47+00:00"
}, },
{ {
"name": "pocketmine/pocketmine-spl", "name": "pocketmine/pocketmine-spl",

2
src/pocketmine/item/Item.php
View File

@ -843,7 +843,7 @@ class Item implements ItemIds, \JsonSerializable{
return true; return true;
}elseif($this->hasCompoundTag() and $item->hasCompoundTag()){ }elseif($this->hasCompoundTag() and $item->hasCompoundTag()){
//Serialized NBT didn't match, check the cached object tree. //Serialized NBT didn't match, check the cached object tree.
return NBT::matchTree($this->getNamedTag(), $item->getNamedTag()); return $this->getNamedTag()->equals($item->getNamedTag());
} }
}else{ }else{
return true; return true;