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

Sitting cats block enderchests from opening (#3906)

Browse Source
This commit is contained in:
Bond-009
2017-08-17 16:29:43 +02:00
committed by Mattes D
parent 1ec85a2b2c
commit 05045860c2
4 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/BlockEntities/EnderChestEntity.cpp
View File

@@ -7,6 +7,7 @@
#include "../Entities/Player.h"
#include "../UI/EnderChestWindow.h"
#include "../ClientHandle.h"
#include "../Mobs/Ocelot.h"
@@ -48,8 +49,13 @@ void cEnderChestEntity::SendTo(cClientHandle & a_Client)
bool cEnderChestEntity::UsedBy(cPlayer * a_Player)
{
// TODO: cats are an obstruction
if ((GetPosY() < cChunkDef::Height - 1) && !cBlockInfo::IsTransparent(GetWorld()->GetBlock(GetPosX(), GetPosY() + 1, GetPosZ())))
if (
(GetPosY() < cChunkDef::Height - 1) &&
(
!cBlockInfo::IsTransparent(GetWorld()->GetBlock(GetPosX(), GetPosY() + 1, GetPosZ())) ||
!cOcelot::IsCatSittingOnBlock(GetWorld(), Vector3d(GetPos()))
)
)
{
// Obstruction, don't open
return false;