summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2015-03-20 12:13:21 +0100
committerMattes D <github@xoft.cz>2015-03-20 12:13:21 +0100
commit967ece168499c0efcdcfd6c25a7cd87099d55be8 (patch)
treefd4b7f4ee896ea905309972a4f760012beb95f49
parentUpdated Core. (diff)
parentRemoved Metavalue from Piston drops. Bugfix #1765 (diff)
downloadcuberite-967ece168499c0efcdcfd6c25a7cd87099d55be8.tar
cuberite-967ece168499c0efcdcfd6c25a7cd87099d55be8.tar.gz
cuberite-967ece168499c0efcdcfd6c25a7cd87099d55be8.tar.bz2
cuberite-967ece168499c0efcdcfd6c25a7cd87099d55be8.tar.lz
cuberite-967ece168499c0efcdcfd6c25a7cd87099d55be8.tar.xz
cuberite-967ece168499c0efcdcfd6c25a7cd87099d55be8.tar.zst
cuberite-967ece168499c0efcdcfd6c25a7cd87099d55be8.zip
-rw-r--r--src/Blocks/BlockPiston.cpp10
-rw-r--r--src/Blocks/BlockPiston.h2
2 files changed, 12 insertions, 0 deletions
diff --git a/src/Blocks/BlockPiston.cpp b/src/Blocks/BlockPiston.cpp
index 8d245cabe..5816920f7 100644
--- a/src/Blocks/BlockPiston.cpp
+++ b/src/Blocks/BlockPiston.cpp
@@ -61,6 +61,16 @@ void cBlockPistonHandler::OnDestroyed(cChunkInterface & a_ChunkInterface, cWorld
+void cBlockPistonHandler::ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta)
+{
+ // Returning Piston Item without Direction-Metavalue
+ a_Pickups.push_back(cItem(m_BlockType, 1));
+}
+
+
+
+
+
bool cBlockPistonHandler::GetPlacementBlockTypeMeta(
cChunkInterface & a_ChunkInterface, cPlayer * a_Player,
int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
diff --git a/src/Blocks/BlockPiston.h b/src/Blocks/BlockPiston.h
index f868f4d8e..9a891025a 100644
--- a/src/Blocks/BlockPiston.h
+++ b/src/Blocks/BlockPiston.h
@@ -15,6 +15,8 @@ public:
virtual void OnDestroyed(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, int a_BlockX, int a_BlockY, int a_BlockZ) override;
+ virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override;
+
virtual bool GetPlacementBlockTypeMeta(
cChunkInterface & a_ChunkInterface, cPlayer * a_Player,
int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,