2 files changed, 42 insertions, 3 deletions

diff --git a/src/BlockEntities/CommandBlockEntity.cpp b/src/BlockEntities/CommandBlockEntity.cpp
index 6e371e0fe..88e55dece 100644
--- a/src/BlockEntities/CommandBlockEntity.cpp
+++ b/src/BlockEntities/CommandBlockEntity.cpp
@@ -45,7 +45,7 @@ void cCommandBlockEntity::UsedBy(cPlayer * a_Player)
 	cWindow * Window = GetWindow();
 	if (Window == NULL)
 	{
-		//OpenWindow(new cDropSpenserWindow(m_PosX, m_PosY, m_PosZ, this));
+		//OpenWindow(new cDropSpenserWindow(m_PosX, m_PosY, m_PosZ, this)); FIXME
 		Window = GetWindow();
 	}
 	
@@ -71,6 +71,24 @@ void cCommandBlockEntity::SetCommand(const AString & a_Cmd)
 
 
 
+void cCommandBlockEntity::SetLastOutput(const AString & a_LastOut)
+{
+	m_LastOutput = a_LastOut;
+}
+
+
+
+
+
+void cCommandBlockEntity::SetResult(const NIBBLETYPE a_Result)
+{
+	m_Result = a_Result;
+}
+
+
+
+
+
 const AString & cCommandBlockEntity::GetCommand(void) const
 {
 	return m_Command;
@@ -89,6 +107,15 @@ const AString & cCommandBlockEntity::GetLastOutput(void) const
 
 
 
+NIBBLETYPE cCommandBlockEntity::GetResult(void) const
+{
+	return m_Result;
+}
+
+
+
+
+
 void cCommandBlockEntity::Activate(void)
 {
 	m_ShouldExecute = true;
@@ -164,8 +191,11 @@ void cCommandBlockEntity::SaveToJson(Json::Value & a_Value)
 void cCommandBlockEntity::Execute()
 {
 	// TODO: Parse arguments and dispatch command
+
 	LOGD("Command: %s", m_Command.c_str());
+
 	m_LastOutput = "";
+	m_Result = 0;
 }
 
 
diff --git a/src/BlockEntities/CommandBlockEntity.h b/src/BlockEntities/CommandBlockEntity.h
index 266a3c33d..c4529a1e6 100644
--- a/src/BlockEntities/CommandBlockEntity.h
+++ b/src/BlockEntities/CommandBlockEntity.h
@@ -48,6 +48,10 @@ public:
 	virtual void SendTo(cClientHandle & a_Client) override;
 	virtual void UsedBy(cPlayer * a_Player) override;
 
+	void SetLastOutput(const AString & a_LastOut);
+
+	void SetResult(const NIBBLETYPE a_Result);
+
 	// tolua_begin
 
 	/// Sets the internal redstone power flag to "on" or "off", depending on the parameter. Calls Activate() if appropriate
@@ -64,6 +68,9 @@ public:
 
 	/// Retrieves the last line of output generated by the command block
 	const AString & GetLastOutput(void) const;
+
+	/// Retrieves the result (signal strength) of the last operation
+	NIBBLETYPE GetResult(void) const;
 	
 	// tolua_end
 	
@@ -75,9 +82,11 @@ private:
 	bool m_ShouldExecute;
 	bool m_IsPowered;
 
-	AString  m_Command;
+	AString m_Command;
+
+	AString m_LastOutput;
 
-	AString  m_LastOutput;
+	NIBBLETYPE m_Result;
 } ;  // tolua_export