summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-06-16 16:03:07 +0200
committerTycho <work.tycho+git@gmail.com>2014-06-16 16:03:07 +0200
commit84c83e0deb8c46be5bd4a25ef00515d48cf296a9 (patch)
tree8e00ca74a4885cb2e7fb113579ded92a74b2e10d
parentMerge pull request #1093 from mc-server/BindingsFix (diff)
downloadcuberite-84c83e0deb8c46be5bd4a25ef00515d48cf296a9.tar
cuberite-84c83e0deb8c46be5bd4a25ef00515d48cf296a9.tar.gz
cuberite-84c83e0deb8c46be5bd4a25ef00515d48cf296a9.tar.bz2
cuberite-84c83e0deb8c46be5bd4a25ef00515d48cf296a9.tar.lz
cuberite-84c83e0deb8c46be5bd4a25ef00515d48cf296a9.tar.xz
cuberite-84c83e0deb8c46be5bd4a25ef00515d48cf296a9.tar.zst
cuberite-84c83e0deb8c46be5bd4a25ef00515d48cf296a9.zip
Diffstat (limited to '')
-rw-r--r--src/Blocks/BlockDoor.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Blocks/BlockDoor.h b/src/Blocks/BlockDoor.h
index bc59051c3..049c4a334 100644
--- a/src/Blocks/BlockDoor.h
+++ b/src/Blocks/BlockDoor.h
@@ -156,10 +156,10 @@ public:
if (a_BlockX > 0)
{
NIBBLETYPE DownMeta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY - 1, a_BlockZ);
- return (DownMeta & 0x07) | 0x08 | (Meta << 4);
+ return (NIBBLETYPE) ((DownMeta & 0x07) | 0x08 | (Meta << 4));
}
// This is the top part of the door at the bottommost layer of the world, there's no bottom:
- return 0x08 | (Meta << 4);
+ return (NIBBLETYPE) (0x08 | (Meta << 4));
}
else
{
@@ -167,7 +167,7 @@ public:
if (a_BlockY < cChunkDef::Height - 1)
{
NIBBLETYPE UpMeta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY + 1, a_BlockZ);
- return Meta | (UpMeta << 4);
+ return (NIBBLETYPE) (Meta | (UpMeta << 4));
}
// This is the bottom part of the door at the topmost layer of the world, there's no top:
return Meta;