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

Fixed invisible chests (#3722)

Browse Source 
Fixes #3479, #3403, #3696
This commit is contained in:
Pablo Beltrán 2017-05-21 11:48:33 +02:00 committed by Mattes D
parent 2359611c57
commit 758622336e
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/BlockEntities/ChestEntity.cpp
View File

@ -5,6 +5,7 @@
#include "../Item.h"
#include "../Entities/Player.h"
#include "../UI/ChestWindow.h"
#include "../ClientHandle.h"
@ -35,10 +36,8 @@ cChestEntity::~cChestEntity()
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);
// Send a dummy "number of players with chest open" packet to make the chest visible:
a_Client.SendBlockAction(m_PosX, m_PosY, m_PosZ, 1, 0, m_BlockType);
}

11
src/BlockEntities/EnderChestEntity.cpp
View File

@ -6,6 +6,7 @@
#include "../Item.h"
#include "../Entities/Player.h"
#include "../UI/EnderChestWindow.h"
#include "../ClientHandle.h"
@ -34,6 +35,16 @@ cEnderChestEntity::~cEnderChestEntity()
void cEnderChestEntity::SendTo(cClientHandle & a_Client)
{
// Send a dummy "number of players with chest open" packet to make the chest visible:
a_Client.SendBlockAction(m_PosX, m_PosY, m_PosZ, 1, 0, m_BlockType);
}
bool cEnderChestEntity::UsedBy(cPlayer * a_Player)
{
// TODO: cats are an obstruction

2
src/BlockEntities/EnderChestEntity.h
View File

@ -25,7 +25,7 @@ public:
// cBlockEntity overrides:
virtual bool UsedBy(cPlayer * a_Player) override;
virtual void SendTo(cClientHandle & a_Client) override { UNUSED(a_Client); }
virtual void SendTo(cClientHandle & a_Client) override;
static void LoadFromJson(const Json::Value & a_Value, cItemGrid & a_Grid);
static void SaveToJson(Json::Value & a_Value, const cItemGrid & a_Grid);