summaryrefslogtreecommitdiffstats
path: root/src/Item.cpp
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-02-27 00:29:14 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-02-27 00:33:52 +0100
commitbaf2d8892127cd6da9d2f6f2f8d991d617c87800 (patch)
tree2f3c2f8d3d9e2659f068e78017a934c195ba77f2 /src/Item.cpp
parentFixed a gcc warning in FastNBT.h. (diff)
downloadcuberite-baf2d8892127cd6da9d2f6f2f8d991d617c87800.tar
cuberite-baf2d8892127cd6da9d2f6f2f8d991d617c87800.tar.gz
cuberite-baf2d8892127cd6da9d2f6f2f8d991d617c87800.tar.bz2
cuberite-baf2d8892127cd6da9d2f6f2f8d991d617c87800.tar.lz
cuberite-baf2d8892127cd6da9d2f6f2f8d991d617c87800.tar.xz
cuberite-baf2d8892127cd6da9d2f6f2f8d991d617c87800.tar.zst
cuberite-baf2d8892127cd6da9d2f6f2f8d991d617c87800.zip
Diffstat (limited to '')
-rw-r--r--src/Item.cpp22
1 files changed, 21 insertions, 1 deletions
diff --git a/src/Item.cpp b/src/Item.cpp
index 9170006b6..61d57e763 100644
--- a/src/Item.cpp
+++ b/src/Item.cpp
@@ -1,4 +1,4 @@
-
+
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "Item.h"
@@ -139,6 +139,16 @@ void cItem::GetJson(Json::Value & a_OutValue) const
{
a_OutValue["Lore"] = m_Lore;
}
+
+ if ((m_ItemType == E_ITEM_FIREWORK_ROCKET) || (m_ItemType == E_ITEM_FIREWORK_STAR))
+ {
+ a_OutValue["Flicker"] = m_FireworkItem.m_HasFlicker;
+ a_OutValue["Trail"] = m_FireworkItem.m_HasTrail;
+ a_OutValue["Type"] = m_FireworkItem.m_Type;
+ a_OutValue["FlightTimeInTicks"] = m_FireworkItem.m_FlightTimeInTicks;
+ a_OutValue["Colours"] = m_FireworkItem.ColoursToString(m_FireworkItem);
+ a_OutValue["FadeColours"] = m_FireworkItem.FadeColoursToString(m_FireworkItem);
+ }
}
}
@@ -157,6 +167,16 @@ void cItem::FromJson(const Json::Value & a_Value)
m_Enchantments.AddFromString(a_Value.get("ench", "").asString());
m_CustomName = a_Value.get("Name", "").asString();
m_Lore = a_Value.get("Lore", "").asString();
+
+ if ((m_ItemType == E_ITEM_FIREWORK_ROCKET) || (m_ItemType == E_ITEM_FIREWORK_STAR))
+ {
+ m_FireworkItem.m_HasFlicker = a_Value.get("Flicker", false).asBool();
+ m_FireworkItem.m_HasTrail = a_Value.get("Trail", false).asBool();
+ m_FireworkItem.m_Type = (NIBBLETYPE)a_Value.get("Type", 0).asInt();
+ m_FireworkItem.m_FlightTimeInTicks = (short)a_Value.get("FlightTimeInTicks", 0).asInt();
+ m_FireworkItem.ColoursFromString(a_Value.get("Colours", "").asString(), m_FireworkItem);
+ m_FireworkItem.FadeColoursFromString(a_Value.get("FadeColours", "").asString(), m_FireworkItem);
+ }
}
}