summaryrefslogtreecommitdiffstats
path: root/src/Inventory.cpp
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-07-23 16:32:09 +0200
committerHowaner <franzi.moos@googlemail.com>2014-07-23 16:32:09 +0200
commit396739cc0faf01a099acbe669c5a9def98d3aaae (patch)
tree91cff4c6ac486b2158edefce878174fe95e2fb3d /src/Inventory.cpp
parentCheckBasicStyle: Added a lua shebang. (diff)
downloadcuberite-396739cc0faf01a099acbe669c5a9def98d3aaae.tar
cuberite-396739cc0faf01a099acbe669c5a9def98d3aaae.tar.gz
cuberite-396739cc0faf01a099acbe669c5a9def98d3aaae.tar.bz2
cuberite-396739cc0faf01a099acbe669c5a9def98d3aaae.tar.lz
cuberite-396739cc0faf01a099acbe669c5a9def98d3aaae.tar.xz
cuberite-396739cc0faf01a099acbe669c5a9def98d3aaae.tar.zst
cuberite-396739cc0faf01a099acbe669c5a9def98d3aaae.zip
Diffstat (limited to 'src/Inventory.cpp')
-rw-r--r--src/Inventory.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/Inventory.cpp b/src/Inventory.cpp
index 0f9716d89..a34d51993 100644
--- a/src/Inventory.cpp
+++ b/src/Inventory.cpp
@@ -222,12 +222,6 @@ void cInventory::SetSlot(int a_SlotNum, const cItem & a_Item)
return;
}
Grid->SetSlot(GridSlotNum, a_Item);
-
- // Broadcast the Equipped Item, if the Slot is changed.
- if ((Grid == &m_HotbarSlots) && (m_EquippedSlotNum == (a_SlotNum - invHotbarOffset)))
- {
- m_Owner.GetWorld()->BroadcastEntityEquipment(m_Owner, 0, a_Item, m_Owner.GetClientHandle());
- }
}
@@ -393,6 +387,10 @@ bool cInventory::DamageItem(int a_SlotNum, short a_Amount)
LOGWARNING("%s: requesting an invalid slot index: %d out of %d", __FUNCTION__, a_SlotNum, invNumSlots - 1);
return false;
}
+ if (a_Amount <= 0)
+ {
+ return false;
+ }
int GridSlotNum = 0;
cItemGrid * Grid = GetGridForSlotNum(a_SlotNum, GridSlotNum);
@@ -713,6 +711,12 @@ void cInventory::OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum)
m_ArmorSlots.GetSlot(a_SlotNum), m_Owner.GetClientHandle()
);
}
+
+ // Broadcast the Equipped Item, if the Slot is changed.
+ if ((a_ItemGrid == &m_HotbarSlots) && (m_EquippedSlotNum == a_SlotNum))
+ {
+ m_Owner.GetWorld()->BroadcastEntityEquipment(m_Owner, 0, GetEquippedItem(), m_Owner.GetClientHandle());
+ }
// Convert the grid-local a_SlotNum to our global SlotNum:
int Base = 0;