summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-12-14 17:52:51 +0100
committerHowaner <franzi.moos@googlemail.com>2014-12-14 17:52:51 +0100
commitc4a71296e46fa9f71ca370ee3d54bfb20634b99a (patch)
treedaeec868654e3ff78fc3d8068c5a142bd7c72892 /src
parentMerge branch 'master' into BlockFixes (diff)
downloadcuberite-c4a71296e46fa9f71ca370ee3d54bfb20634b99a.tar
cuberite-c4a71296e46fa9f71ca370ee3d54bfb20634b99a.tar.gz
cuberite-c4a71296e46fa9f71ca370ee3d54bfb20634b99a.tar.bz2
cuberite-c4a71296e46fa9f71ca370ee3d54bfb20634b99a.tar.lz
cuberite-c4a71296e46fa9f71ca370ee3d54bfb20634b99a.tar.xz
cuberite-c4a71296e46fa9f71ca370ee3d54bfb20634b99a.tar.zst
cuberite-c4a71296e46fa9f71ca370ee3d54bfb20634b99a.zip
Diffstat (limited to '')
-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 0cd9c66e0..43caf6ff2 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() + 1 < cChunkDef::Height) && cBlockInfo::IsTransparent(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() + 1 < cChunkDef::Height) && cBlockInfo::IsTransparent(a_Chest->GetWorld()->GetBlock(a_Chest->GetPosX(), a_Chest->GetPosY() + 1, a_Chest->GetPosZ())))
{
// Obstruction, don't open
return false;