flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed style.

Browse Source
This commit is contained in:
madmaxoft 2014-08-30 22:24:04 +02:00
parent 26b8471280
commit db663c7ee1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/BlockEntities/CommandBlockEntity.cpp
View File

@ -211,13 +211,14 @@ void cCommandBlockEntity::Execute()
} }
} CmdBlockOutCb(this); } CmdBlockOutCb(this);
if ( // Administrator commands are not executable by command blocks // Administrator commands are not executable by command blocks:
if (
(m_Command != "stop") && (m_Command != "stop") &&
(m_Command != "restart") && (m_Command != "restart") &&
(m_Command != "kick") && (m_Command != "kick") &&
(m_Command != "ban") && (m_Command != "ban") &&
(m_Command != "ipban") (m_Command != "ipban")
) )
{ {
cServer * Server = cRoot::Get()->GetServer(); cServer * Server = cRoot::Get()->GetServer();
LOGD("cCommandBlockEntity: Executing command %s", m_Command.c_str()); LOGD("cCommandBlockEntity: Executing command %s", m_Command.c_str());

5
src/ChunkMap.cpp
View File

@ -1880,10 +1880,11 @@ void cChunkMap::DoExplosionAt(double a_ExplosionSize, double a_BlockX, double a_
} }
else if ((m_World->GetTNTShrapnelLevel() > slNone) && (m_World->GetTickRandomNumber(100) < 20)) // 20% chance of flinging stuff around else if ((m_World->GetTNTShrapnelLevel() > slNone) && (m_World->GetTickRandomNumber(100) < 20)) // 20% chance of flinging stuff around
{ {
// If the block is shrapnel-able, make a falling block entity out of it:
if ( if (
((m_World->GetTNTShrapnelLevel() == slAll) && cBlockInfo::FullyOccupiesVoxel(Block)) || ((m_World->GetTNTShrapnelLevel() == slAll) && cBlockInfo::FullyOccupiesVoxel(Block)) ||
((m_World->GetTNTShrapnelLevel() == slGravityAffectedOnly) && ((Block == E_BLOCK_SAND) || (Block == E_BLOCK_GRAVEL))) ((m_World->GetTNTShrapnelLevel() == slGravityAffectedOnly) && ((Block == E_BLOCK_SAND) || (Block == E_BLOCK_GRAVEL)))
) )
{ {
m_World->SpawnFallingBlock(bx + x, by + y + 5, bz + z, Block, area.GetBlockMeta(bx + x, by + y, bz + z)); m_World->SpawnFallingBlock(bx + x, by + y + 5, bz + z, Block, area.GetBlockMeta(bx + x, by + y, bz + z));
} }
@ -1891,7 +1892,7 @@ void cChunkMap::DoExplosionAt(double a_ExplosionSize, double a_BlockX, double a_
area.SetBlockTypeMeta(bx + x, by + y, bz + z, E_BLOCK_AIR, 0); area.SetBlockTypeMeta(bx + x, by + y, bz + z, E_BLOCK_AIR, 0);
a_BlocksAffected.push_back(Vector3i(bx + x, by + y, bz + z)); a_BlocksAffected.push_back(Vector3i(bx + x, by + y, bz + z));
break; break;
} }
} // switch (BlockType) } // switch (BlockType)
} // for z } // for z