summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-07-31 18:41:48 +0200
committerHowaner <franzi.moos@googlemail.com>2014-07-31 18:41:48 +0200
commitbffad5043619d143d595806122dc625746126ed8 (patch)
tree486f2d8ca5a52e3155c7b92aaaa9e166acc3e8b6 /src
parentMerge pull request #1267 from mc-server/RoofedForest (diff)
downloadcuberite-bffad5043619d143d595806122dc625746126ed8.tar
cuberite-bffad5043619d143d595806122dc625746126ed8.tar.gz
cuberite-bffad5043619d143d595806122dc625746126ed8.tar.bz2
cuberite-bffad5043619d143d595806122dc625746126ed8.tar.lz
cuberite-bffad5043619d143d595806122dc625746126ed8.tar.xz
cuberite-bffad5043619d143d595806122dc625746126ed8.tar.zst
cuberite-bffad5043619d143d595806122dc625746126ed8.zip
Diffstat (limited to 'src')
-rw-r--r--src/Blocks/BlockIce.h14
-rw-r--r--src/Items/ItemHandler.cpp1
2 files changed, 13 insertions, 2 deletions
diff --git a/src/Blocks/BlockIce.h b/src/Blocks/BlockIce.h
index c50623594..c085e9290 100644
--- a/src/Blocks/BlockIce.h
+++ b/src/Blocks/BlockIce.h
@@ -24,9 +24,19 @@ public:
}
- virtual void OnDestroyed(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, int a_BlockX, int a_BlockY, int a_BlockZ) override
+ virtual void OnDestroyedByPlayer(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) override
{
- // TODO: Ice destroyed with air below it should turn into air instead of water
+ if (a_Player->IsGameModeCreative() || (a_BlockY <= 0))
+ {
+ return;
+ }
+
+ BLOCKTYPE BlockBelow = a_ChunkInterface.GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ);
+ if (!cBlockInfo::IsSolid(BlockBelow) && !IsBlockLava(BlockBelow) && !IsBlockWater(BlockBelow))
+ {
+ return;
+ }
+
a_ChunkInterface.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/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp
index d36b5d663..acfd1e648 100644
--- a/src/Items/ItemHandler.cpp
+++ b/src/Items/ItemHandler.cpp
@@ -578,6 +578,7 @@ bool cItemHandler::CanHarvestBlock(BLOCKTYPE a_BlockType)
case E_BLOCK_LAPIS_BLOCK:
case E_BLOCK_SNOW:
case E_BLOCK_VINES:
+ case E_BLOCK_PACKED_ICE:
{
return false;
}