summaryrefslogtreecommitdiffstats
path: root/source/Blocks
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-09-22 21:43:00 +0200
committermadmaxoft <github@xoft.cz>2013-09-22 21:43:00 +0200
commit4a00d26da9abc3b9d8d0814e6cfdfdb243ca5874 (patch)
treefe93ea411459ddc25bd98a8cce85b6a30beffcdf /source/Blocks
parentMerge pull request #186 from tigerw/bugfixes (diff)
downloadcuberite-4a00d26da9abc3b9d8d0814e6cfdfdb243ca5874.tar
cuberite-4a00d26da9abc3b9d8d0814e6cfdfdb243ca5874.tar.gz
cuberite-4a00d26da9abc3b9d8d0814e6cfdfdb243ca5874.tar.bz2
cuberite-4a00d26da9abc3b9d8d0814e6cfdfdb243ca5874.tar.lz
cuberite-4a00d26da9abc3b9d8d0814e6cfdfdb243ca5874.tar.xz
cuberite-4a00d26da9abc3b9d8d0814e6cfdfdb243ca5874.tar.zst
cuberite-4a00d26da9abc3b9d8d0814e6cfdfdb243ca5874.zip
Diffstat (limited to 'source/Blocks')
-rw-r--r--source/Blocks/BlockPlanks.h2
-rw-r--r--source/Blocks/BlockWood.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/Blocks/BlockPlanks.h b/source/Blocks/BlockPlanks.h
index b30164741..f3b8dbfb6 100644
--- a/source/Blocks/BlockPlanks.h
+++ b/source/Blocks/BlockPlanks.h
@@ -24,7 +24,7 @@ public:
) override
{
a_BlockType = m_BlockType;
- NIBBLETYPE Meta = a_Player->GetEquippedItem().m_ItemDamage;
+ NIBBLETYPE Meta = (NIBBLETYPE)(a_Player->GetEquippedItem().m_ItemDamage);
a_BlockMeta = Meta;
return true;
}
diff --git a/source/Blocks/BlockWood.h b/source/Blocks/BlockWood.h
index dd4544586..cb5ee995a 100644
--- a/source/Blocks/BlockWood.h
+++ b/source/Blocks/BlockWood.h
@@ -24,7 +24,7 @@ public:
) override
{
a_BlockType = m_BlockType;
- NIBBLETYPE Meta = a_Player->GetEquippedItem().m_ItemDamage;
+ NIBBLETYPE Meta = (NIBBLETYPE)(a_Player->GetEquippedItem().m_ItemDamage);
a_BlockMeta = BlockFaceToMetaData(a_BlockFace, Meta);
return true;
}