summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities/ChestEntity.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2015-03-23 12:25:22 +0100
committerMattes D <github@xoft.cz>2015-03-23 12:25:22 +0100
commitf1ef7f57ff76e9d321276059454950297d5a6a39 (patch)
treedb230dbd9bdf920f6553b6ef59d1bae286b7918c /src/BlockEntities/ChestEntity.cpp
parentMerge pull request #1792 from mc-server/APIDocs (diff)
parentCorrect world height validations. (diff)
downloadcuberite-f1ef7f57ff76e9d321276059454950297d5a6a39.tar
cuberite-f1ef7f57ff76e9d321276059454950297d5a6a39.tar.gz
cuberite-f1ef7f57ff76e9d321276059454950297d5a6a39.tar.bz2
cuberite-f1ef7f57ff76e9d321276059454950297d5a6a39.tar.lz
cuberite-f1ef7f57ff76e9d321276059454950297d5a6a39.tar.xz
cuberite-f1ef7f57ff76e9d321276059454950297d5a6a39.tar.zst
cuberite-f1ef7f57ff76e9d321276059454950297d5a6a39.zip
Diffstat (limited to 'src/BlockEntities/ChestEntity.cpp')
-rw-r--r--src/BlockEntities/ChestEntity.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/BlockEntities/ChestEntity.cpp b/src/BlockEntities/ChestEntity.cpp
index 3821f9aab..1c186310c 100644
--- a/src/BlockEntities/ChestEntity.cpp
+++ b/src/BlockEntities/ChestEntity.cpp
@@ -80,7 +80,7 @@ void cChestEntity::UsedBy(cPlayer * a_Player)
void cChestEntity::OpenNewWindow(void)
{
// TODO: cats are an obstruction
- if ((GetPosY() + 1 < cChunkDef::Height) && cBlockInfo::IsSolid(GetWorld()->GetBlock(GetPosX(), GetPosY() + 1, GetPosZ())))
+ if ((GetPosY() < cChunkDef::Height - 1) && cBlockInfo::IsSolid(GetWorld()->GetBlock(GetPosX(), GetPosY() + 1, GetPosZ())))
{
// Obstruction, don't open
return;
@@ -99,7 +99,7 @@ void cChestEntity::OpenNewWindow(void)
virtual bool Item(cChestEntity * a_Chest) override
{
- if ((a_Chest->GetPosY() + 1 < cChunkDef::Height) && cBlockInfo::IsSolid(a_Chest->GetWorld()->GetBlock(a_Chest->GetPosX(), a_Chest->GetPosY() + 1, a_Chest->GetPosZ())))
+ if ((a_Chest->GetPosY() < cChunkDef::Height - 1) && cBlockInfo::IsSolid(a_Chest->GetWorld()->GetBlock(a_Chest->GetPosX(), a_Chest->GetPosY() + 1, a_Chest->GetPosZ())))
{
// Obstruction, don't open
return false;