1 files changed, 26 insertions, 47 deletions

diff --git a/src/BlockEntities/CommandBlockEntity.cpp b/src/BlockEntities/CommandBlockEntity.cpp
index 45f8a3e4d..1a5a3f01e 100644
--- a/src/BlockEntities/CommandBlockEntity.cpp
+++ b/src/BlockEntities/CommandBlockEntity.cpp
@@ -4,15 +4,14 @@
 // Implements the cCommandBlockEntity class representing a single command block in the world
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
-#include "json/json.h"
 #include "CommandBlockEntity.h"
-#include "../Entities/Player.h"
-#include "../WorldStorage/FastNBT.h"
 
 #include "../CommandOutput.h"
 #include "../Root.h"
 #include "../Server.h"  // ExecuteConsoleCommand()
-#include "../Chunk.h"
+#include "../ChatColor.h"
+#include "../World.h"
+#include "../ClientHandle.h"
 
 
 
@@ -153,46 +152,13 @@ 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()
 {
-	if (m_World != NULL)
+	ASSERT(m_World != NULL);  // Execute should not be called before the command block is attached to a world
+	
+	if (!m_World->AreCommandBlocksEnabled())
 	{
-		if (!m_World->AreCommandBlocksEnabled())
-		{
-			return;
-		}
+		return;
 	}
 
 	class CommandBlockOutCb :
@@ -206,15 +172,28 @@ void cCommandBlockEntity::Execute()
 		virtual void Out(const AString & a_Text)
 		{
 			// Overwrite field
-			m_CmdBlock->SetLastOutput(a_Text);
+			m_CmdBlock->SetLastOutput(cClientHandle::FormatChatPrefix(m_CmdBlock->GetWorld()->ShouldUseChatPrefixes(), "SUCCESS", cChatColor::Green, cChatColor::White) + a_Text);
 		}
 	} CmdBlockOutCb(this);
 
-	LOGD("cCommandBlockEntity: Executing command %s", m_Command.c_str());
-
-	cServer * Server = cRoot::Get()->GetServer();
-
-	Server->ExecuteConsoleCommand(m_Command, CmdBlockOutCb);
+	// Administrator commands are not executable by command blocks:
+	if (
+		(m_Command != "stop") &&
+		(m_Command != "restart") &&
+		(m_Command != "kick") &&
+		(m_Command != "ban") &&
+		(m_Command != "ipban")
+	)
+	{
+		cServer * Server = cRoot::Get()->GetServer();
+		LOGD("cCommandBlockEntity: Executing command %s", m_Command.c_str());
+		Server->ExecuteConsoleCommand(m_Command, CmdBlockOutCb);
+	}
+	else
+	{
+		SetLastOutput(cClientHandle::FormatChatPrefix(GetWorld()->ShouldUseChatPrefixes(), "FAILURE", cChatColor::Rose, cChatColor::White) + "Adminstration commands can not be executed");
+		LOGD("cCommandBlockEntity: Prevented execution of administration command %s", m_Command.c_str());
+	}
 
 	// TODO 2014-01-18 xdot: Update the signal strength.
 	m_Result = 0;