diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-08-14 12:44:02 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-08-14 12:44:02 +0200 |
| commit | 303b1a9c45cb74a656c9a099d669c89b92e74098 (patch) | |
| tree | 06e472545ade2601edd300d8160dce1900b0084f /source/Blocks | |
| parent | YET ANOTHER ERROR >:( (diff) | |
| download | cuberite-303b1a9c45cb74a656c9a099d669c89b92e74098.tar cuberite-303b1a9c45cb74a656c9a099d669c89b92e74098.tar.gz cuberite-303b1a9c45cb74a656c9a099d669c89b92e74098.tar.bz2 cuberite-303b1a9c45cb74a656c9a099d669c89b92e74098.tar.lz cuberite-303b1a9c45cb74a656c9a099d669c89b92e74098.tar.xz cuberite-303b1a9c45cb74a656c9a099d669c89b92e74098.tar.zst cuberite-303b1a9c45cb74a656c9a099d669c89b92e74098.zip | |
Diffstat (limited to '')
| -rw-r--r-- | source/Blocks/BlockFluid.h | 6 | ||||
| -rw-r--r-- | source/Blocks/BlockIce.h | 2 |
2 files changed, 7 insertions, 1 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 } } ; |