flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Represent cItem::m_Lore as an AStringVector (#3882)

Browse Source 
* Replace cItem::m_Lore with AStringVector

* Reword deprecation warning

* Fix lua bindings
This commit is contained in:
peterbell10
2017-08-18 11:29:54 +01:00
committed by Tiger Wang
parent 8f1ddfa6c3
commit b8dda388e0
13 changed files with 251 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Item.cpp
View File

@@ -158,7 +158,12 @@ void cItem::GetJson(Json::Value & a_OutValue) const
}
if (!IsLoreEmpty())
{
a_OutValue["Lore"] = m_Lore;
auto & LoreArray = (a_OutValue["Lore"] = Json::Value(Json::arrayValue));
for (const auto & Line : m_LoreTable)
{
LoreArray.append(Line);
}
}
if (m_ItemColor.IsValid())
@@ -196,7 +201,11 @@ void cItem::FromJson(const Json::Value & a_Value)
m_Enchantments.Clear();
m_Enchantments.AddFromString(a_Value.get("ench", "").asString());
m_CustomName = a_Value.get("Name", "").asString();
m_Lore = a_Value.get("Lore", "").asString();
auto Lore = a_Value.get("Lore", Json::arrayValue);
for (auto & Line : Lore)
{
m_LoreTable.push_back(Line.asString());
}
int red = a_Value.get("Color_Red", -1).asInt();
int green = a_Value.get("Color_Green", -1).asInt();