summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBond-009 <bond.009@outlook.com>2017-08-31 17:50:07 +0200
committerMattes D <github@xoft.cz>2017-08-31 17:50:07 +0200
commit00d077de1b1fb4f500d05f5b35d52d809beae595 (patch)
tree4b75564f78f638c6510c508474eed674a6c61983 /src
parentMerge pull request #3969 from peterbell10/cuboid (diff)
downloadcuberite-00d077de1b1fb4f500d05f5b35d52d809beae595.tar
cuberite-00d077de1b1fb4f500d05f5b35d52d809beae595.tar.gz
cuberite-00d077de1b1fb4f500d05f5b35d52d809beae595.tar.bz2
cuberite-00d077de1b1fb4f500d05f5b35d52d809beae595.tar.lz
cuberite-00d077de1b1fb4f500d05f5b35d52d809beae595.tar.xz
cuberite-00d077de1b1fb4f500d05f5b35d52d809beae595.tar.zst
cuberite-00d077de1b1fb4f500d05f5b35d52d809beae595.zip
Diffstat (limited to '')
-rw-r--r--src/Blocks/BlockEnderchest.h1
-rw-r--r--src/Blocks/BlockHandler.cpp6
2 files changed, 6 insertions, 1 deletions
diff --git a/src/Blocks/BlockEnderchest.h b/src/Blocks/BlockEnderchest.h
index 7ce162cd5..8fd5c2a89 100644
--- a/src/Blocks/BlockEnderchest.h
+++ b/src/Blocks/BlockEnderchest.h
@@ -18,7 +18,6 @@ public:
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
- // todo: Drop Ender Chest if using silk touch pickaxe
a_Pickups.push_back(cItem(E_BLOCK_OBSIDIAN, 8, 0));
}
diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp
index 76cfc763f..41b9780ac 100644
--- a/src/Blocks/BlockHandler.cpp
+++ b/src/Blocks/BlockHandler.cpp
@@ -525,6 +525,12 @@ void cBlockHandler::DropBlock(cChunkInterface & a_ChunkInterface, cWorldInterfac
// Need to access the bed entity to get the color for the item damage
ConvertToPickups(a_WorldInterface, Pickups, Meta, a_BlockX, a_BlockY, a_BlockZ);
}
+ case E_BLOCK_ENDER_CHEST:
+ {
+ // Reset meta to 0
+ Pickups.Add(m_BlockType, 1, 0);
+ break;
+ }
default: Pickups.Add(m_BlockType, 1, Meta); break;
}
}