diff options
| author | Alexander Harkness <me@bearbin.net> | 2024-11-02 22:27:47 +0100 |
|---|---|---|
| committer | Alexander Harkness <me@bearbin.net> | 2024-11-02 22:27:47 +0100 |
| commit | cb50ec10591c0e0e4b9915e642bc50d3d8d1fd0a (patch) | |
| tree | f647b20e1823f1846af88e832cf82a4a02e96e69 /src/Blocks/BlockLilypad.h | |
| parent | Improve clang-format config file, remove automatically enforced code style from contrib guide. (diff) | |
| download | cuberite-cb50ec10591c0e0e4b9915e642bc50d3d8d1fd0a.tar cuberite-cb50ec10591c0e0e4b9915e642bc50d3d8d1fd0a.tar.gz cuberite-cb50ec10591c0e0e4b9915e642bc50d3d8d1fd0a.tar.bz2 cuberite-cb50ec10591c0e0e4b9915e642bc50d3d8d1fd0a.tar.lz cuberite-cb50ec10591c0e0e4b9915e642bc50d3d8d1fd0a.tar.xz cuberite-cb50ec10591c0e0e4b9915e642bc50d3d8d1fd0a.tar.zst cuberite-cb50ec10591c0e0e4b9915e642bc50d3d8d1fd0a.zip | |
Diffstat (limited to 'src/Blocks/BlockLilypad.h')
| -rw-r--r-- | src/Blocks/BlockLilypad.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/Blocks/BlockLilypad.h b/src/Blocks/BlockLilypad.h index e39d34566..741fdf79f 100644 --- a/src/Blocks/BlockLilypad.h +++ b/src/Blocks/BlockLilypad.h @@ -7,17 +7,14 @@ -class cBlockLilypadHandler final : - public cClearMetaOnDrop<cBlockHandler> +class cBlockLilypadHandler final : public cClearMetaOnDrop<cBlockHandler> { using Super = cClearMetaOnDrop<cBlockHandler>; -public: - + public: using Super::Super; -private: - + private: virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) const override { UNUSED(a_Meta); @@ -39,12 +36,10 @@ private: NIBBLETYPE UnderMeta; a_Chunk.GetBlockTypeMeta(UnderPos, UnderType, UnderMeta); return ( - (((UnderType == E_BLOCK_STATIONARY_WATER) || (UnderType == E_BLOCK_WATER)) && (UnderMeta == 0)) || // A water source is below - (UnderType == E_BLOCK_ICE) || (UnderType == E_BLOCK_FROSTED_ICE) // Or (frosted) ice + (((UnderType == E_BLOCK_STATIONARY_WATER) || (UnderType == E_BLOCK_WATER)) && (UnderMeta == 0) + ) || // A water source is below + (UnderType == E_BLOCK_ICE) || + (UnderType == E_BLOCK_FROSTED_ICE) // Or (frosted) ice ); } }; - - - - |