summaryrefslogtreecommitdiffstats
path: root/src/Blocks
diff options
context:
space:
mode:
authorKingCol13 <48412633+KingCol13@users.noreply.github.com>2020-09-19 08:59:21 +0200
committerGitHub <noreply@github.com>2020-09-19 08:59:21 +0200
commit272a8029e0b8280f61ad2d3bfd0e8353d4256aec (patch)
treef7d8e82b719d0e815358a436c8f0a0a1817078e4 /src/Blocks
parentStyle, no need to tag struct with s (diff)
downloadcuberite-272a8029e0b8280f61ad2d3bfd0e8353d4256aec.tar
cuberite-272a8029e0b8280f61ad2d3bfd0e8353d4256aec.tar.gz
cuberite-272a8029e0b8280f61ad2d3bfd0e8353d4256aec.tar.bz2
cuberite-272a8029e0b8280f61ad2d3bfd0e8353d4256aec.tar.lz
cuberite-272a8029e0b8280f61ad2d3bfd0e8353d4256aec.tar.xz
cuberite-272a8029e0b8280f61ad2d3bfd0e8353d4256aec.tar.zst
cuberite-272a8029e0b8280f61ad2d3bfd0e8353d4256aec.zip
Diffstat (limited to 'src/Blocks')
-rw-r--r--src/Blocks/BlockOre.h7
-rw-r--r--src/Blocks/CMakeLists.txt1
2 files changed, 7 insertions, 1 deletions
diff --git a/src/Blocks/BlockOre.h b/src/Blocks/BlockOre.h
index 6200b09f4..46b18f008 100644
--- a/src/Blocks/BlockOre.h
+++ b/src/Blocks/BlockOre.h
@@ -27,7 +27,12 @@ public:
// If using silk-touch, drop self rather than the resource:
if (ToolHasSilkTouch(a_Tool))
{
- return cItem(m_BlockType);
+ switch (m_BlockType)
+ {
+ // If it was a glowing redstone ore, drop a normal redstone ore
+ case E_BLOCK_REDSTONE_ORE_GLOWING: return cItem(E_BLOCK_REDSTONE_ORE);
+ default: return cItem(m_BlockType);
+ }
}
// TODO: Handle the Fortune enchantment here
diff --git a/src/Blocks/CMakeLists.txt b/src/Blocks/CMakeLists.txt
index 1026848df..87464bd04 100644
--- a/src/Blocks/CMakeLists.txt
+++ b/src/Blocks/CMakeLists.txt
@@ -72,6 +72,7 @@ target_sources(
BlockRail.h
BlockRedstone.h
BlockRedstoneLamp.h
+ BlockRedstoneOre.h
BlockRedstoneRepeater.h
BlockRedstoneTorch.h
BlockSand.h