diff options
| author | Nounours Heureux <schtroumps31@gmail.com> | 2015-07-06 18:39:02 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2015-07-07 12:29:52 +0200 |
| commit | 91833b7cb8f40de0e5f938ccbae64e56d2358ec7 (patch) | |
| tree | a8c9ae2d453816996b3a6e13397a0f1540bc81af | |
| parent | Fixed warnings generated by 64-bit MSVC. (diff) | |
| download | cuberite-91833b7cb8f40de0e5f938ccbae64e56d2358ec7.tar cuberite-91833b7cb8f40de0e5f938ccbae64e56d2358ec7.tar.gz cuberite-91833b7cb8f40de0e5f938ccbae64e56d2358ec7.tar.bz2 cuberite-91833b7cb8f40de0e5f938ccbae64e56d2358ec7.tar.lz cuberite-91833b7cb8f40de0e5f938ccbae64e56d2358ec7.tar.xz cuberite-91833b7cb8f40de0e5f938ccbae64e56d2358ec7.tar.zst cuberite-91833b7cb8f40de0e5f938ccbae64e56d2358ec7.zip | |
| -rw-r--r-- | src/BlockEntities/ChestEntity.cpp | 16 | ||||
| -rw-r--r-- | src/BlockEntities/EnderChestEntity.cpp | 12 |
2 files changed, 13 insertions, 15 deletions
diff --git a/src/BlockEntities/ChestEntity.cpp b/src/BlockEntities/ChestEntity.cpp index 1c186310c..21baac977 100644 --- a/src/BlockEntities/ChestEntity.cpp +++ b/src/BlockEntities/ChestEntity.cpp @@ -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 // All the actual handling is in the cWindow UI code that gets called when the chest is rclked - + UNUSED(a_Client); } @@ -54,7 +54,7 @@ void cChestEntity::UsedBy(cPlayer * a_Player) OpenNewWindow(); Window = GetWindow(); } - + // Open the window for the player: if (Window != nullptr) { @@ -80,7 +80,7 @@ void cChestEntity::UsedBy(cPlayer * a_Player) void cChestEntity::OpenNewWindow(void) { // 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 return; @@ -96,10 +96,10 @@ void cChestEntity::OpenNewWindow(void) m_ThisChest(a_ThisChest) { } - + 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 return false; @@ -119,7 +119,7 @@ void cChestEntity::OpenNewWindow(void) return false; } } ; - + // Scan neighbors for adjacent chests: cOpenDouble OpenDbl(this); if ( @@ -136,7 +136,3 @@ void cChestEntity::OpenNewWindow(void) // There is no chest neighbor, open a single-chest window: OpenWindow(new cChestWindow(this)); } - - - - diff --git a/src/BlockEntities/EnderChestEntity.cpp b/src/BlockEntities/EnderChestEntity.cpp index ab5c5a2de..00e203520 100644 --- a/src/BlockEntities/EnderChestEntity.cpp +++ b/src/BlockEntities/EnderChestEntity.cpp @@ -35,6 +35,12 @@ cEnderChestEntity::~cEnderChestEntity() 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: cWindow * Window = GetWindow(); if (Window == nullptr) @@ -42,7 +48,7 @@ void cEnderChestEntity::UsedBy(cPlayer * a_Player) OpenNewWindow(); Window = GetWindow(); } - + // Open the window for the player: if (Window != nullptr) { @@ -91,7 +97,3 @@ void cEnderChestEntity::SaveToJson(Json::Value & a_Value, const cItemGrid & a_Gr a_Value.append(Slot); } } - - - - |