diff options
| author | Bond-009 <bond.009@outlook.com> | 2017-08-17 16:29:43 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2017-08-17 16:29:43 +0200 |
| commit | 05045860c2002e3c9a79d90290f4d65fdd171141 (patch) | |
| tree | 0265750956435f284d5b9c499dbbe5c90231db73 /src/BlockEntities/ChestEntity.cpp | |
| parent | Add cLuaWindow OnClicked Callback (#3901) (diff) | |
| download | cuberite-05045860c2002e3c9a79d90290f4d65fdd171141.tar cuberite-05045860c2002e3c9a79d90290f4d65fdd171141.tar.gz cuberite-05045860c2002e3c9a79d90290f4d65fdd171141.tar.bz2 cuberite-05045860c2002e3c9a79d90290f4d65fdd171141.tar.lz cuberite-05045860c2002e3c9a79d90290f4d65fdd171141.tar.xz cuberite-05045860c2002e3c9a79d90290f4d65fdd171141.tar.zst cuberite-05045860c2002e3c9a79d90290f4d65fdd171141.zip | |
Diffstat (limited to 'src/BlockEntities/ChestEntity.cpp')
| -rw-r--r-- | src/BlockEntities/ChestEntity.cpp | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/src/BlockEntities/ChestEntity.cpp b/src/BlockEntities/ChestEntity.cpp index 54f6e0dfa..a8f5b7242 100644 --- a/src/BlockEntities/ChestEntity.cpp +++ b/src/BlockEntities/ChestEntity.cpp @@ -7,7 +7,6 @@ #include "../UI/ChestWindow.h" #include "../ClientHandle.h" #include "../Mobs/Ocelot.h" -#include "../BoundingBox.h" @@ -219,32 +218,13 @@ void cChestEntity::DestroyWindow() -class cFindSittingCat : - public cEntityCallback -{ - virtual bool Item(cEntity * a_Entity) override - { - return ( - (a_Entity->GetEntityType() == cEntity::etMonster) && - (static_cast<cMonster *>(a_Entity)->GetMobType() == eMonsterType::mtOcelot) && - (static_cast<cOcelot *>(a_Entity)->IsSitting()) - ); - } -}; - - - - - bool cChestEntity::IsBlocked() { - cFindSittingCat FindSittingCat; return ( - (GetPosY() >= cChunkDef::Height - 1) || - !cBlockInfo::IsTransparent(GetWorld()->GetBlock(GetPosX(), GetPosY() + 1, GetPosZ())) || + (GetPosY() < cChunkDef::Height - 1) && ( - (GetWorld()->GetBlock(GetPosX(), GetPosY() + 1, GetPosZ()) == E_BLOCK_AIR) && - !GetWorld()->ForEachEntityInBox(cBoundingBox(Vector3d(GetPosX(), GetPosY() + 1, GetPosZ()), 1, 1), FindSittingCat) + !cBlockInfo::IsTransparent(GetWorld()->GetBlock(GetPosX(), GetPosY() + 1, GetPosZ())) || + !cOcelot::IsCatSittingOnBlock(GetWorld(), Vector3d(GetPos())) ) ); } |