summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities/BeaconEntity.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-10-01 07:47:17 +0200
committerMattes D <github@xoft.cz>2014-10-01 07:47:17 +0200
commit3ccda572b3535a5ac783290c4b6f082b2d1b36a1 (patch)
tree6470a1932417dbba2fe4145ae631fdd323ad7fad /src/BlockEntities/BeaconEntity.cpp
parentMerge pull request #1487 from mc-server/BlockFixes (diff)
parentRemoved WSSCompact (diff)
downloadcuberite-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/BeaconEntity.cpp')
-rw-r--r--src/BlockEntities/BeaconEntity.cpp62
1 files changed, 0 insertions, 62 deletions
diff --git a/src/BlockEntities/BeaconEntity.cpp b/src/BlockEntities/BeaconEntity.cpp
index dcf659f47..02f45a097 100644
--- a/src/BlockEntities/BeaconEntity.cpp
+++ b/src/BlockEntities/BeaconEntity.cpp
@@ -303,68 +303,6 @@ void cBeaconEntity::UsedBy(cPlayer * a_Player)
-bool cBeaconEntity::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();
-
- Json::Value AllSlots = a_Value.get("Slots", 0);
- int SlotIdx = 0;
- for (Json::Value::iterator itr = AllSlots.begin(); itr != AllSlots.end(); ++itr)
- {
- cItem Item;
- Item.FromJson(*itr);
- SetSlot(SlotIdx, Item);
- SlotIdx++;
- }
-
- m_BeaconLevel = (char)a_Value.get("Level", 0).asInt();
- int PrimaryEffect = a_Value.get("PrimaryEffect", 0).asInt();
- int SecondaryEffect = a_Value.get("SecondaryEffect", 0).asInt();
-
- if ((PrimaryEffect >= 0) && (PrimaryEffect <= (int)cEntityEffect::effSaturation))
- {
- m_PrimaryEffect = (cEntityEffect::eType)PrimaryEffect;
- }
-
- if ((SecondaryEffect >= 0) && (SecondaryEffect <= (int)cEntityEffect::effSaturation))
- {
- m_SecondaryEffect = (cEntityEffect::eType)SecondaryEffect;
- }
-
- return true;
-}
-
-
-
-
-
-void cBeaconEntity::SaveToJson(Json::Value& a_Value)
-{
- a_Value["x"] = m_PosX;
- a_Value["y"] = m_PosY;
- a_Value["z"] = m_PosZ;
-
- Json::Value AllSlots;
- int NumSlots = m_Contents.GetNumSlots();
- for (int i = 0; i < NumSlots; i++)
- {
- Json::Value Slot;
- m_Contents.GetSlot(i).GetJson(Slot);
- AllSlots.append(Slot);
- }
- a_Value["Slots"] = AllSlots;
-
- a_Value["Level"] = m_BeaconLevel;
- a_Value["PrimaryEffect"] = (int)m_PrimaryEffect;
- a_Value["SecondaryEffect"] = (int)m_SecondaryEffect;
-}
-
-
-
-
-
void cBeaconEntity::SendTo(cClientHandle & a_Client)
{
a_Client.SendUpdateBlockEntity(*this);