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

Improved NBT json parsing, attribute base

Browse Source
This commit is contained in:
Shoghi Cervantes
2015-08-08 22:39:43 +02:00
parent f5429ef585
commit a9ead5567b
7 changed files with 514 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,24 +62,20 @@ class GiveCommand extends VanillaCommand{
}
if(isset($args[3])){
$tags = $exception = null;
$data = implode(" ", array_slice($args, 3));
$data = preg_replace("/([A-Za-z0-9_]+[ ]*):/", '"$1":', $data);
$tags = @json_decode($data, true);
if(!is_array($tags)){
$sender->sendMessage(new TranslationContainer("commands.give.tagError", [json_last_error_msg()]));
try{
$tags = NBT::parseJSON($data);
}catch (\Exception $ex){
$exception = $ex;
}
if(!($tags instanceof Compound) or $exception !== null){
$sender->sendMessage(new TranslationContainer("commands.give.tagError", [$exception !== null ? $exception->getMessage() : "Invalid tag conversion"]));
return true;
}
$nbt = new NBT();
$nbt->setArray($tags);
$tag = $nbt->getData();
if(!($tag instanceof Compound)){
$sender->sendMessage(new TranslationContainer("commands.give.tagError", ["Invalid tag conversion"]));
return true;
}
$item->setNamedTag($tag);
$item->setNamedTag($tags);
}
if($player instanceof Player){