diff options
| author | Mattes D <github@xoft.cz> | 2014-10-01 07:47:17 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-10-01 07:47:17 +0200 |
| commit | 3ccda572b3535a5ac783290c4b6f082b2d1b36a1 (patch) | |
| tree | 6470a1932417dbba2fe4145ae631fdd323ad7fad /src/BlockEntities/FlowerPotEntity.cpp | |
| parent | Merge pull request #1487 from mc-server/BlockFixes (diff) | |
| parent | Removed WSSCompact (diff) | |
| download | cuberite-3ccda572b3535a5ac783290c4b6f082b2d1b36a1.tar cuberite-3ccda572b3535a5ac783290c4b6f082b2d1b36a1.tar.gz cuberite-3ccda572b3535a5ac783290c4b6f082b2d1b36a1.tar.bz2 cuberite-3ccda572b3535a5ac783290c4b6f082b2d1b36a1.tar.lz cuberite-3ccda572b3535a5ac783290c4b6f082b2d1b36a1.tar.xz cuberite-3ccda572b3535a5ac783290c4b6f082b2d1b36a1.tar.zst cuberite-3ccda572b3535a5ac783290c4b6f082b2d1b36a1.zip | |
Diffstat (limited to 'src/BlockEntities/FlowerPotEntity.cpp')
| -rw-r--r-- | src/BlockEntities/FlowerPotEntity.cpp | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/BlockEntities/FlowerPotEntity.cpp b/src/BlockEntities/FlowerPotEntity.cpp index d2bc59d34..01560f814 100644 --- a/src/BlockEntities/FlowerPotEntity.cpp +++ b/src/BlockEntities/FlowerPotEntity.cpp @@ -72,37 +72,6 @@ void cFlowerPotEntity::Destroy(void) -bool cFlowerPotEntity::LoadFromJson(const Json::Value & a_Value) -{ - m_PosX = a_Value.get("x", 0).asInt(); - m_PosY = a_Value.get("y", 0).asInt(); - m_PosZ = a_Value.get("z", 0).asInt(); - - m_Item = cItem(); - m_Item.FromJson(a_Value.get("Item", 0)); - - return true; -} - - - - - -void cFlowerPotEntity::SaveToJson(Json::Value & a_Value) -{ - a_Value["x"] = m_PosX; - a_Value["y"] = m_PosY; - a_Value["z"] = m_PosZ; - - Json::Value Item; - m_Item.GetJson(Item); - a_Value["Item"] = Item; -} - - - - - bool cFlowerPotEntity::IsFlower(short m_ItemType, short m_ItemData) { switch (m_ItemType) |