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

Item: use base64 instead of hex for json encoding NBT

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-06-12 18:31:35 +01:00
parent b5da6b1591
commit 3def3cd502
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -876,7 +876,7 @@ class Item implements ItemIds, \JsonSerializable{
} }
if($this->hasCompoundTag()){ if($this->hasCompoundTag()){
$data["nbt_hex"] = bin2hex($this->getCompoundTag()); $data["nbt_b64"] = base64_encode($this->getCompoundTag());
} }
return $data; return $data;
@ -889,11 +889,21 @@ class Item implements ItemIds, \JsonSerializable{
* @return Item * @return Item
*/ */
final public static function jsonDeserialize(array $data) : Item{ final public static function jsonDeserialize(array $data) : Item{
$nbt = "";
//Backwards compatibility
if(isset($data["nbt"])){
$nbt = $data["nbt"];
}elseif(isset($data["nbt_hex"])){
$nbt = hex2bin($data["nbt_hex"]);
}elseif(isset($data["nbt_b64"])){
$nbt = base64_decode($data["nbt_b64"], true);
}
return ItemFactory::get( return ItemFactory::get(
(int) $data["id"], (int) $data["id"],
(int) ($data["damage"] ?? 0), (int) ($data["damage"] ?? 0),
(int) ($data["count"] ?? 1), (int) ($data["count"] ?? 1),
(string) ($data["nbt"] ?? (isset($data["nbt_hex"]) ? hex2bin($data["nbt_hex"]) : "")) //`nbt` key might contain old raw data (string) $nbt
); );
} }