diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-02-12 23:06:13 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-02-12 23:06:13 +0100 |
| commit | e915a0df4cf78f41a200f0a06aabf069aec1bb07 (patch) | |
| tree | 03a270c2dac1aec28d685efa05c61c8914bed8d1 | |
| parent | Changed inheritance a bit (diff) | |
| download | cuberite-e915a0df4cf78f41a200f0a06aabf069aec1bb07.tar cuberite-e915a0df4cf78f41a200f0a06aabf069aec1bb07.tar.gz cuberite-e915a0df4cf78f41a200f0a06aabf069aec1bb07.tar.bz2 cuberite-e915a0df4cf78f41a200f0a06aabf069aec1bb07.tar.lz cuberite-e915a0df4cf78f41a200f0a06aabf069aec1bb07.tar.xz cuberite-e915a0df4cf78f41a200f0a06aabf069aec1bb07.tar.zst cuberite-e915a0df4cf78f41a200f0a06aabf069aec1bb07.zip | |
| -rw-r--r-- | src/BlockEntities/ChestEntity.cpp | 15 | ||||
| -rw-r--r-- | src/BlockEntities/ChestEntity.h | 1 | ||||
| -rw-r--r-- | src/BlockEntities/DropSpenserEntity.cpp | 7 | ||||
| -rw-r--r-- | src/BlockEntities/SignEntity.h | 2 |
4 files changed, 2 insertions, 23 deletions
diff --git a/src/BlockEntities/ChestEntity.cpp b/src/BlockEntities/ChestEntity.cpp index 9282da7fd..dfbe6ae87 100644 --- a/src/BlockEntities/ChestEntity.cpp +++ b/src/BlockEntities/ChestEntity.cpp @@ -170,18 +170,3 @@ void cChestEntity::OpenNewWindow(void) - -void cChestEntity::OnSlotChanged(cItemGrid * a_Grid, int a_SlotNum) -{ - super::OnSlotChanged(a_Grid, a_SlotNum); - - cWindow * Window = GetWindow(); - if (Window != NULL) - { - Window->BroadcastWholeWindow(); - } -} - - - - diff --git a/src/BlockEntities/ChestEntity.h b/src/BlockEntities/ChestEntity.h index 3167d64a0..ce16f84d7 100644 --- a/src/BlockEntities/ChestEntity.h +++ b/src/BlockEntities/ChestEntity.h @@ -47,7 +47,6 @@ public: virtual void SaveToJson(Json::Value & a_Value) override; virtual void SendTo(cClientHandle & a_Client) override; virtual void UsedBy(cPlayer * a_Player) override; - virtual void OnSlotChanged(cItemGrid * a_Grid, int a_SlotNum) override; /// Opens a new chest window for this chest. Scans for neighbors to open a double chest window, if appropriate. void OpenNewWindow(void); diff --git a/src/BlockEntities/DropSpenserEntity.cpp b/src/BlockEntities/DropSpenserEntity.cpp index 7c9a40ce6..81df0fc8c 100644 --- a/src/BlockEntities/DropSpenserEntity.cpp +++ b/src/BlockEntities/DropSpenserEntity.cpp @@ -99,13 +99,6 @@ void cDropSpenserEntity::DropSpense(cChunk & a_Chunk) } m_World->BroadcastSoundParticleEffect(2000, m_PosX, m_PosY, m_PosZ, SmokeDir); m_World->BroadcastSoundEffect("random.click", m_PosX * 8, m_PosY * 8, m_PosZ * 8, 1.0f, 1.0f); - - // Update the UI window, if open: - cWindow * Window = GetWindow(); - if (Window != NULL) - { - Window->BroadcastWholeWindow(); - } } diff --git a/src/BlockEntities/SignEntity.h b/src/BlockEntities/SignEntity.h index d998ff1e8..2b965747c 100644 --- a/src/BlockEntities/SignEntity.h +++ b/src/BlockEntities/SignEntity.h @@ -56,6 +56,8 @@ public: virtual void UsedBy(cPlayer * a_Player) override; virtual void SendTo(cClientHandle & a_Client) override; + + static const char * GetClassStatic(void) { return "cSignrEntity"; } private: |