flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Chests don't open if obstructed

Browse Source 
* Fixes FS383
This commit is contained in:
Tiger Wang 2014-06-22 14:47:05 +01:00
parent ede0f13b51
commit b2bf466122
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/BlockEntities/ChestEntity.cpp
View File

@ -122,6 +122,13 @@ void cChestEntity::UsedBy(cPlayer * a_Player)
void cChestEntity::OpenNewWindow(void) void cChestEntity::OpenNewWindow(void)
{ {
// TODO: cats are an obstruction
if ((GetPosY() + 1 < cChunkDef::Height) && cBlockInfo::IsSolid(GetWorld()->GetBlock(GetPosX(), GetPosY() + 1, GetPosZ())))
{
// Obstruction, don't open
return;
}
// Callback for opening together with neighbor chest: // Callback for opening together with neighbor chest:
class cOpenDouble : class cOpenDouble :
public cChestCallback public cChestCallback
@ -135,6 +142,12 @@ void cChestEntity::OpenNewWindow(void)
virtual bool Item(cChestEntity * a_Chest) override 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())))
{
// Obstruction, don't open
return false;
}
// The primary chest should eb the one with lesser X or Z coord: // The primary chest should eb the one with lesser X or Z coord:
cChestEntity * Primary = a_Chest; cChestEntity * Primary = a_Chest;
cChestEntity * Secondary = m_ThisChest; cChestEntity * Secondary = m_ThisChest;