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/CommandBlockEntity.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/CommandBlockEntity.cpp')
| -rw-r--r-- | src/BlockEntities/CommandBlockEntity.cpp | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/src/BlockEntities/CommandBlockEntity.cpp b/src/BlockEntities/CommandBlockEntity.cpp index 318874a9b..1a5a3f01e 100644 --- a/src/BlockEntities/CommandBlockEntity.cpp +++ b/src/BlockEntities/CommandBlockEntity.cpp @@ -152,38 +152,6 @@ void cCommandBlockEntity::SendTo(cClientHandle & a_Client) -bool cCommandBlockEntity::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_Command = a_Value.get("Command", "").asString(); - m_LastOutput = a_Value.get("LastOutput", "").asString(); - m_Result = (NIBBLETYPE)a_Value.get("SuccessCount", 0).asInt(); - - return true; -} - - - - - -void cCommandBlockEntity::SaveToJson(Json::Value & a_Value) -{ - a_Value["x"] = m_PosX; - a_Value["y"] = m_PosY; - a_Value["z"] = m_PosZ; - - a_Value["Command"] = m_Command; - a_Value["LastOutput"] = m_LastOutput; - a_Value["SuccessCount"] = m_Result; -} - - - - - void cCommandBlockEntity::Execute() { ASSERT(m_World != NULL); // Execute should not be called before the command block is attached to a world |