summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-01-23 14:14:33 +0100
committerMattes D <github@xoft.cz>2014-01-23 14:14:33 +0100
commit97ee3340e302bd4bdd93054262bb9743ca37c764 (patch)
treecd5a87f40c86b685cb6b7f3cd31246f7744a96df /src
parentMerge remote-tracking branch 'xdot/master' (diff)
downloadcuberite-97ee3340e302bd4bdd93054262bb9743ca37c764.tar
cuberite-97ee3340e302bd4bdd93054262bb9743ca37c764.tar.gz
cuberite-97ee3340e302bd4bdd93054262bb9743ca37c764.tar.bz2
cuberite-97ee3340e302bd4bdd93054262bb9743ca37c764.tar.lz
cuberite-97ee3340e302bd4bdd93054262bb9743ca37c764.tar.xz
cuberite-97ee3340e302bd4bdd93054262bb9743ca37c764.tar.zst
cuberite-97ee3340e302bd4bdd93054262bb9743ca37c764.zip
Diffstat (limited to 'src')
-rw-r--r--src/BlockEntities/CommandBlockEntity.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/BlockEntities/CommandBlockEntity.cpp b/src/BlockEntities/CommandBlockEntity.cpp
index db8eb1436..0bc6ca359 100644
--- a/src/BlockEntities/CommandBlockEntity.cpp
+++ b/src/BlockEntities/CommandBlockEntity.cpp
@@ -183,7 +183,7 @@ void cCommandBlockEntity::SaveToJson(Json::Value & a_Value)
void cCommandBlockEntity::Execute()
{
- if (m_World)
+ if (m_World != NULL)
{
if (!m_World->AreCommandBlocksEnabled())
{
@@ -194,10 +194,10 @@ void cCommandBlockEntity::Execute()
class CommandBlockOutCb :
public cCommandOutputCallback
{
- cCommandBlockEntity* m_CmdBlock;
+ cCommandBlockEntity * m_CmdBlock;
public:
- CommandBlockOutCb(cCommandBlockEntity* a_CmdBlock) : m_CmdBlock(a_CmdBlock) {}
+ CommandBlockOutCb(cCommandBlockEntity * a_CmdBlock) : m_CmdBlock(a_CmdBlock) {}
virtual void Out(const AString & a_Text)
{
@@ -208,7 +208,7 @@ void cCommandBlockEntity::Execute()
LOGD("cCommandBlockEntity: Executing command %s", m_Command.c_str());
- cServer* Server = cRoot::Get()->GetServer();
+ cServer * Server = cRoot::Get()->GetServer();
Server->ExecuteConsoleCommand(m_Command, CmdBlockOutCb);