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

(Ender) Chests are obstructed by opaque blocks.

Browse Source
This commit is contained in:
Nounours Heureux 2015-07-06 18:39:02 +02:00 committed by Mattes D
parent bebd4de144
commit 91833b7cb8
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/BlockEntities/ChestEntity.cpp
View File

@ -37,7 +37,7 @@ void cChestEntity::SendTo(cClientHandle & a_Client)
{ {
// The chest entity doesn't need anything sent to the client when it's created / gets in the viewdistance // The chest entity doesn't need anything sent to the client when it's created / gets in the viewdistance
// All the actual handling is in the cWindow UI code that gets called when the chest is rclked // All the actual handling is in the cWindow UI code that gets called when the chest is rclked
UNUSED(a_Client); UNUSED(a_Client);
} }
@ -54,7 +54,7 @@ void cChestEntity::UsedBy(cPlayer * a_Player)
OpenNewWindow(); OpenNewWindow();
Window = GetWindow(); Window = GetWindow();
} }
// Open the window for the player: // Open the window for the player:
if (Window != nullptr) if (Window != nullptr)
{ {
@ -80,7 +80,7 @@ void cChestEntity::UsedBy(cPlayer * a_Player)
void cChestEntity::OpenNewWindow(void) void cChestEntity::OpenNewWindow(void)
{ {
// TODO: cats are an obstruction // TODO: cats are an obstruction
if ((GetPosY() < cChunkDef::Height - 1) && cBlockInfo::IsSolid(GetWorld()->GetBlock(GetPosX(), GetPosY() + 1, GetPosZ()))) if ((GetPosY() < cChunkDef::Height - 1) && !cBlockInfo::IsTransparent(GetWorld()->GetBlock(GetPosX(), GetPosY() + 1, GetPosZ())))
{ {
// Obstruction, don't open // Obstruction, don't open
return; return;
@ -96,10 +96,10 @@ void cChestEntity::OpenNewWindow(void)
m_ThisChest(a_ThisChest) m_ThisChest(a_ThisChest)
{ {
} }
virtual bool Item(cChestEntity * a_Chest) override virtual bool Item(cChestEntity * a_Chest) override
{ {
if ((a_Chest->GetPosY() < cChunkDef::Height - 1) && cBlockInfo::IsSolid(a_Chest->GetWorld()->GetBlock(a_Chest->GetPosX(), a_Chest->GetPosY() + 1, a_Chest->GetPosZ()))) if ((a_Chest->GetPosY() < cChunkDef::Height - 1) && !cBlockInfo::IsTransparent(a_Chest->GetWorld()->GetBlock(a_Chest->GetPosX(), a_Chest->GetPosY() + 1, a_Chest->GetPosZ())))
{ {
// Obstruction, don't open // Obstruction, don't open
return false; return false;
@ -119,7 +119,7 @@ void cChestEntity::OpenNewWindow(void)
return false; return false;
} }
} ; } ;
// Scan neighbors for adjacent chests: // Scan neighbors for adjacent chests:
cOpenDouble OpenDbl(this); cOpenDouble OpenDbl(this);
if ( if (
@ -136,7 +136,3 @@ void cChestEntity::OpenNewWindow(void)
// There is no chest neighbor, open a single-chest window: // There is no chest neighbor, open a single-chest window:
OpenWindow(new cChestWindow(this)); OpenWindow(new cChestWindow(this));
} }

12
src/BlockEntities/EnderChestEntity.cpp
View File

@ -35,6 +35,12 @@ cEnderChestEntity::~cEnderChestEntity()
void cEnderChestEntity::UsedBy(cPlayer * a_Player) void cEnderChestEntity::UsedBy(cPlayer * a_Player)
{ {
// TODO: cats are an obstruction
if ((GetPosY() < cChunkDef::Height - 1) && !cBlockInfo::IsTransparent(GetWorld()->GetBlock(GetPosX(), GetPosY() + 1, GetPosZ())))
{
// Obstruction, don't open
return;
}
// If the window is not created, open it anew: // If the window is not created, open it anew:
cWindow * Window = GetWindow(); cWindow * Window = GetWindow();
if (Window == nullptr) if (Window == nullptr)
@ -42,7 +48,7 @@ void cEnderChestEntity::UsedBy(cPlayer * a_Player)
OpenNewWindow(); OpenNewWindow();
Window = GetWindow(); Window = GetWindow();
} }
// Open the window for the player: // Open the window for the player:
if (Window != nullptr) if (Window != nullptr)
{ {
@ -91,7 +97,3 @@ void cEnderChestEntity::SaveToJson(Json::Value & a_Value, const cItemGrid & a_Gr
a_Value.append(Slot); a_Value.append(Slot);
} }
} }