diff options
Diffstat (limited to 'source/Blocks')
| -rw-r--r-- | source/Blocks/BlockFluid.h | 6 | ||||
| -rw-r--r-- | source/Blocks/BlockIce.h | 2 | ||||
| -rw-r--r-- | source/Blocks/BlockTorch.h | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/source/Blocks/BlockFluid.h b/source/Blocks/BlockFluid.h index 696bfb3ce..0db2f60c4 100644 --- a/source/Blocks/BlockFluid.h +++ b/source/Blocks/BlockFluid.h @@ -17,6 +17,12 @@ public: : cBlockHandler(a_BlockType) { + } + + + virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override + { + // No pickups } diff --git a/source/Blocks/BlockIce.h b/source/Blocks/BlockIce.h index 11fe425f3..af4961114 100644 --- a/source/Blocks/BlockIce.h +++ b/source/Blocks/BlockIce.h @@ -27,7 +27,7 @@ public: virtual void OnDestroyed(cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ) override { // TODO: Ice destroyed with air below it should turn into air instead of water - a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_STATIONARY_WATER, 8); + a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_WATER, 0); // This is called later than the real destroying of this ice block } } ; diff --git a/source/Blocks/BlockTorch.h b/source/Blocks/BlockTorch.h index 99c1a7b75..3a50cab77 100644 --- a/source/Blocks/BlockTorch.h +++ b/source/Blocks/BlockTorch.h @@ -103,7 +103,6 @@ public: virtual bool DoesAllowBlockOnTop(void) override { return true; - //was false } |