summaryrefslogtreecommitdiffstats
path: root/src/UI
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-07-02 22:59:21 +0200
committerMattes D <github@xoft.cz>2014-07-02 22:59:21 +0200
commit39fff19955e07460b1160ed962829c9e0a51a454 (patch)
treecd2b8aa7e24fb9c9052c55a67ea3364b837a5cf5 /src/UI
parentMerge remote-tracking branch 'origin/master' (diff)
parentSuggestion (diff)
downloadcuberite-39fff19955e07460b1160ed962829c9e0a51a454.tar
cuberite-39fff19955e07460b1160ed962829c9e0a51a454.tar.gz
cuberite-39fff19955e07460b1160ed962829c9e0a51a454.tar.bz2
cuberite-39fff19955e07460b1160ed962829c9e0a51a454.tar.lz
cuberite-39fff19955e07460b1160ed962829c9e0a51a454.tar.xz
cuberite-39fff19955e07460b1160ed962829c9e0a51a454.tar.zst
cuberite-39fff19955e07460b1160ed962829c9e0a51a454.zip
Diffstat (limited to 'src/UI')
-rw-r--r--src/UI/SlotArea.cpp5
-rw-r--r--src/UI/Window.cpp4
2 files changed, 4 insertions, 5 deletions
diff --git a/src/UI/SlotArea.cpp b/src/UI/SlotArea.cpp
index 728692f2a..48ebf489b 100644
--- a/src/UI/SlotArea.cpp
+++ b/src/UI/SlotArea.cpp
@@ -1341,8 +1341,7 @@ cSlotAreaEnderChest::cSlotAreaEnderChest(cEnderChestEntity * a_EnderChest, cWind
const cItem * cSlotAreaEnderChest::GetSlot(int a_SlotNum, cPlayer & a_Player) const
{
- // a_SlotNum ranges from 0 to 26, use that to index the chest entity's inventory directly:
- return &(m_EnderChest->GetSlot(a_SlotNum));
+ return &(a_Player.GetEnderChestContents().GetSlot(a_SlotNum));
}
@@ -1351,7 +1350,7 @@ const cItem * cSlotAreaEnderChest::GetSlot(int a_SlotNum, cPlayer & a_Player) co
void cSlotAreaEnderChest::SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem & a_Item)
{
- m_EnderChest->SetSlot(a_SlotNum, a_Item);
+ a_Player.GetEnderChestContents().SetSlot(a_SlotNum, a_Item);
}
diff --git a/src/UI/Window.cpp b/src/UI/Window.cpp
index e465b701a..381c6e121 100644
--- a/src/UI/Window.cpp
+++ b/src/UI/Window.cpp
@@ -145,8 +145,7 @@ void cWindow::GetSlots(cPlayer & a_Player, cItems & a_Slots) const
{
int NumSlots = (*itr)->GetNumSlots();
for (int i = 0; i < NumSlots; i++)
- {
-
+ {
const cItem * Item = (*itr)->GetSlot(i, a_Player);
if (Item == NULL)
{
@@ -1017,6 +1016,7 @@ cEnderChestWindow::~cEnderChestWindow()
// Send out the chest-close packet:
m_World->BroadcastBlockAction(m_BlockX, m_BlockY, m_BlockZ, 1, 0, E_BLOCK_ENDER_CHEST);
+ // Play the closing sound
m_World->BroadcastSoundEffect("random.chestclosed", m_BlockX * 8, m_BlockY * 8, m_BlockZ * 8, 1, 1);
}