diff options
author | Tycho <work.tycho+git@gmail.com> | 2014-08-06 14:19:22 +0200 |
---|---|---|
committer | Tycho <work.tycho+git@gmail.com> | 2014-08-06 14:19:22 +0200 |
commit | 6acddd0cad25078ae2c67e7a0eb353e9d4d100e2 (patch) | |
tree | 380eeff37562c319e6933d537e1f63e2c0fcdeb2 /src | |
parent | Fixed multiple inhertance being output by tolua (diff) | |
download | cuberite-6acddd0cad25078ae2c67e7a0eb353e9d4d100e2.tar cuberite-6acddd0cad25078ae2c67e7a0eb353e9d4d100e2.tar.gz cuberite-6acddd0cad25078ae2c67e7a0eb353e9d4d100e2.tar.bz2 cuberite-6acddd0cad25078ae2c67e7a0eb353e9d4d100e2.tar.lz cuberite-6acddd0cad25078ae2c67e7a0eb353e9d4d100e2.tar.xz cuberite-6acddd0cad25078ae2c67e7a0eb353e9d4d100e2.tar.zst cuberite-6acddd0cad25078ae2c67e7a0eb353e9d4d100e2.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/BlockEntities/NoteEntity.h | 5 | ||||
-rw-r--r-- | src/BlockEntities/RedstonePoweredEntity.h | 2 | ||||
-rw-r--r-- | src/Chunk.cpp | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/BlockEntities/NoteEntity.h b/src/BlockEntities/NoteEntity.h index dd201e0a9..f538de060 100644 --- a/src/BlockEntities/NoteEntity.h +++ b/src/BlockEntities/NoteEntity.h @@ -61,7 +61,10 @@ public: virtual void SetRedstonePower(bool a_Value) { - if (a_Value) MakeSound(); + if (a_Value) + { + MakeSound(); + } } static const char * GetClassStatic(void) { return "cNoteEntity"; } diff --git a/src/BlockEntities/RedstonePoweredEntity.h b/src/BlockEntities/RedstonePoweredEntity.h index 7d6904442..f11df4fc4 100644 --- a/src/BlockEntities/RedstonePoweredEntity.h +++ b/src/BlockEntities/RedstonePoweredEntity.h @@ -8,6 +8,6 @@ public: virtual ~cRedstonePoweredEntity() {}; -/// Sets the internal redstone power flag to "on" or "off", depending on the parameter. Calls Activate() if appropriate + /// Sets the internal redstone power flag to "on" or "off", depending on the parameter. Calls Activate() if appropriate virtual void SetRedstonePower(bool a_IsPowered) = 0; }; diff --git a/src/Chunk.cpp b/src/Chunk.cpp index 1e8d0e6f0..a79a485a6 100644 --- a/src/Chunk.cpp +++ b/src/Chunk.cpp @@ -2142,10 +2142,10 @@ bool cChunk::DoWithRedstonePoweredEntityAt(int a_BlockX, int a_BlockY, int a_Blo case E_BLOCK_DROPPER: case E_BLOCK_DISPENSER: case E_BLOCK_NOTE_BLOCK: - break; + break; default: - // There is a block entity here, but of different type. No other block entity can be here, so we can safely bail out - return false; + // There is a block entity here, but of different type. No other block entity can be here, so we can safely bail out + return false; } if (a_Callback.Item((cRedstonePoweredEntity *)*itr)) |